diff --git a/views/entity_translation.views.inc b/views/entity_translation.views.inc
index 8a59f2f..3353c1d 100644
--- a/views/entity_translation.views.inc
+++ b/views/entity_translation.views.inc
@@ -215,8 +215,8 @@ function entity_translation_views_data_alter(&$data) {
           'base field' => 'entity_id',
           'relationship field' => $info['entity keys']['id'],
           'handler' => 'entity_translation_handler_relationship',
-          // We add our information here in the definition,
-          // so we can copy it later.
+          // We add our information here in the definition, so we can copy it
+          // later.
           'left_table' => $info['base table'],
           'left_field' => $info['entity keys']['id'],
           'entity type' => $type,
diff --git a/views/entity_translation_handler_field_label.inc b/views/entity_translation_handler_field_label.inc
index 82a08bc..dd972d3 100644
--- a/views/entity_translation_handler_field_label.inc
+++ b/views/entity_translation_handler_field_label.inc
@@ -55,7 +55,7 @@ class entity_translation_handler_field_label extends views_handler_field {
     }
   }
 
-  function render(&$values) {
+  function render($values) {
     $entity_type = $this->get_value($values, 'entity_type');
     $entity_id = $this->get_value($values, 'entity_id');
     $entity = $this->entities[$entity_type][$entity_id];
diff --git a/views/entity_translation_handler_field_translate_link.inc b/views/entity_translation_handler_field_translate_link.inc
index 52985f9..bc8d8b9 100644
--- a/views/entity_translation_handler_field_translate_link.inc
+++ b/views/entity_translation_handler_field_translate_link.inc
@@ -33,6 +33,7 @@ class entity_translation_handler_field_translate_link extends views_handler_fiel
     $options['text'] = array('default' => '', 'translatable' => TRUE);
     return $options;
   }
+
   /**
    * Add the option to set the title of the translate link.
    * @see views_handler_field::options_form()
@@ -82,8 +83,8 @@ class entity_translation_handler_field_translate_link extends views_handler_fiel
     if (!entity_translation_enabled($entity_type) || !entity_translation_tab_access($entity_type) || $language == 'und') {
       return;
     }
-    // We use the entity info here to avoid having to call entity_load()
-    // for all entities.
+    // We use the entity info here to avoid having to call entity_load() for all
+    // the entities.
     $info = entity_get_info($entity_type);
     $path = $info['translation']['entity_translation']['base path'];
     $path = str_replace($info['translation']['entity_translation']['path wildcard'], $entity_id, $path);
diff --git a/views/entity_translation_handler_filter_entity_type.inc b/views/entity_translation_handler_filter_entity_type.inc
index 5c2d8ef..0eb76e2 100644
--- a/views/entity_translation_handler_filter_entity_type.inc
+++ b/views/entity_translation_handler_filter_entity_type.inc
@@ -5,8 +5,8 @@
  */
 
 /**
- * handler shows all available entity types
- * that are enabled for entity translation as options.
+ * This handler shows all available entity types that are enabled for entity
+ * translation as options.
  */
 class entity_translation_handler_filter_entity_type extends views_handler_filter_in_operator {
 
diff --git a/views/entity_translation_handler_filter_language.inc b/views/entity_translation_handler_filter_language.inc
index 7e4b8db..93cca9e 100644
--- a/views/entity_translation_handler_filter_language.inc
+++ b/views/entity_translation_handler_filter_language.inc
@@ -5,8 +5,8 @@
  */
 
 /**
- * Extends the locale language filter in order for it to work
- * with the entity translation table structure.
+ * Extends the locale language filter in order for it to work with the entity
+ * translation table structure.
  */
 class entity_translation_handler_filter_language extends views_handler_filter_locale_language {
 
diff --git a/views/entity_translation_handler_relationship.inc b/views/entity_translation_handler_relationship.inc
index 52da2b5..733c858 100644
--- a/views/entity_translation_handler_relationship.inc
+++ b/views/entity_translation_handler_relationship.inc
@@ -22,10 +22,10 @@ class entity_translation_handler_relationship extends views_handler_relationship
     $join->definition = $def;
     $join->construct();
     $join->adjusted = TRUE;
-    // use a short alias for the table.
+    // Use a short alias for the table.
     $alias = $def['table'] . '_' . $this->table;
-    // We need to add a condition on entity type to the join
-    // to avoid getting relationships to entities with other types.
+    // We need to add a condition on entity type to the join to avoid getting
+    // relationships to entities with other types.
     $join->extra = "$alias.entity_type = '{$def['entity type']}'";
     $this->alias = $this->query->add_relationship($alias, $join, 'entity_translation', $this->relationship);
   }