diff --git a/entityreference_browser.js b/entityreference_browser.js
index 758a3f2..f8d8631 100644
--- a/entityreference_browser.js
+++ b/entityreference_browser.js
@@ -15,84 +15,83 @@
     }
   };
 
-})(jQuery);
+  $(document).ready(function($) {
+    var data = {};
+    // Add view settings to the data.
+    for (var key in Drupal.settings.views.ajaxViews[0]) {
+      data[key] = Drupal.settings.views.ajaxViews[0][key];
+    }
 
+    $.ajax({
+      url: Drupal.settings.views.ajax_path,
+      type: 'GET',
+      data: data,
+      success: function(response) {
+        var viewDiv = '.view-dom-id-' + data.view_dom_id;
+        var target = $('div.entityreference-browser-view-widget');
+        if (response[2] != null) {
+          target.html(response[2].data);
+        }
+        if (Drupal.settings && Drupal.settings.views && Drupal.settings.views.ajaxViews) {
+          $.each(Drupal.settings.views.ajaxViews, function(i, settings) {
+            // @todo: Figure out where to store the object.
+            new Drupal.views.ajaxView(settings);
+          });
+        }
+
+        // put a listener on the drag / drop UL item
+        var $select = $(".entityreference-browser-selected");
+        $select.sortable({
+          update: entityreference_browser_update
+        });
+      },
+      error: function(xhr) {
+        var target = $('div.entityreference-browser-view-widget');
+        target.html('<p id="artist-load-error">Error text.</p>');
+        $('#block-request-0').hide();
+      },
+      dataType: 'json'
+    });
 
-jQuery(document).ready(function($) {
-  var data = {};
-  // Add view settings to the data.
-  for (var key in Drupal.settings.views.ajaxViews[0]) {
-    data[key] = Drupal.settings.views.ajaxViews[0][key];
-  }
+    $('body').delegate('a.picker', 'click', function(event) {
+      event.preventDefault;
 
-  $.ajax({
-    url: Drupal.settings.views.ajax_path,
-    type: 'GET',
-    data: data,
-    success: function(response) {
-      var viewDiv = '.view-dom-id-' + data.view_dom_id;
-      var target = $('div.entityreference-browser-view-widget');
-      if (response[2] != null) {
-        target.html(response[2].data);
-      }
-      if (Drupal.settings && Drupal.settings.views && Drupal.settings.views.ajaxViews) {
-        $.each(Drupal.settings.views.ajaxViews, function(i, settings) {
-          // @todo: Figure out where to store the object.
-          new Drupal.views.ajaxView(settings);
-        });
-      }
+      var entityId = $(this).attr('data-id');
+      var label = $(this).text();
 
-      // put a listener on the drag / drop UL item
-      var $select = $(".entityreference-browser-selected");
-      $select.sortable({
-        update: entityreference_browser_update
-      });
-    },
-    error: function(xhr) {
-      var target = $('div.entityreference-browser-view-widget');
-      target.html('<p id="artist-load-error">Error text.</p>');
-      $('#block-request-0').hide();
-    },
-    dataType: 'json'
-  });
+      // Add entity only one time.
+      if(!$('li[data-id="' + entityId + '"]').length) {
+        var entityItemRemove = $('<a />').attr('href', Drupal.settings.basePath + 'node/' + entityId).attr('class', 'remove').attr('data-id', entityId).html('[' + Drupal.t('remove') + ']');
+        var entityItem = $('<li />').attr('data-id', entityId).html(label + ' ').append(entityItemRemove);
 
-  $('body').delegate('a.picker', 'click', function(event) {
-    event.preventDefault;
+        $('ul.entityreference-browser').append(entityItem);
 
-    var entityId = $(this).attr('data-id');
-    var label = $(this).text();
-    
-    // Add entity only one time.
-    if(!$('li[data-id="' + entityId + '"]').length) {
-      var entityItemRemove = $('<a />').attr('href', '/node/' + entityId).attr('class', 'remove').attr('data-id', entityId).html(' [remove] ');
-      var entityItem = $('<li />').attr('data-id', entityId).html(label).append(entityItemRemove);
+        entityreference_browser_update();
+      }
 
-      $('ul.entityreference-browser').append(entityItem);
+      return false;
+    });
 
-      entityreference_browser_update();
-    }
-    
-    return false;
-  });
+    $('body').delegate('a.remove', 'click', function(event) {
+      event.preventDefault;
 
-  $('body').delegate('a.remove', 'click', function(event) {
-    event.preventDefault;
+      var entityId = $(this).attr('data-id');
 
-    var entityId = $(this).attr('data-id');
+      $('li[data-id="' + entityId + '"]').remove();
 
-    $('li[data-id="' + entityId + '"]').remove();
+      entityreference_browser_update();
+      return false;
+    });
 
-    entityreference_browser_update();
-    return false;
   });
 
-});
+  function entityreference_browser_update(event, ui) {
+    var items = [];
+    $(".entityreference-browser-selected li").each(function(index) {
+      items.push($(this).attr('data-id'));
+    });
 
-function entityreference_browser_update(event, ui) {
-  var items = [];
-  jQuery(".entityreference-browser-selected li").each(function(index) {
-    items.push(jQuery(this).attr('data-id'));
-  });
+    $("input.entityreference-browser-values").val(items.join(','));
+  }
 
-  jQuery("input.entityreference-browser-values").val(items.join(','));
-}
+})(jQuery);
\ No newline at end of file
diff --git a/entityreference_browser.module b/entityreference_browser.module
index 241c9b6..ff37bff 100644
--- a/entityreference_browser.module
+++ b/entityreference_browser.module
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * The main functionalities are located here.
+ */
 
 /**
  * Implements hook_views_api().
@@ -79,7 +83,7 @@ function entityreference_browser_field_formatter_view($entity_type, $entity, $fi
   switch ($display['type']) {
     case 'entityreference_browser_formatter':
       foreach ($items as $delta => $item) {
-        $output = "<input type=\"checkbox\" /> <a data-id=\"{$item['value']}\" href=\"node/{$item['value']}\">{$item['value']}</a>";
+        $output = '<input type="checkbox" /> ' . l($item['value'], 'node/' . $item['value'], array('attributes' => array('data-id' => $item['value'])));
         $element[$delta] = array('#markup' => $output);
       }
       break;
@@ -197,7 +201,7 @@ function entityreference_browser_field_widget_form(&$form, &$form_state, $field,
       ),
     ),
   );
-  
+
   // Note that the views ajax is getting manually placed here. This is to
   // overcome a bug that happeens when the normal views_add_js('ajax_view');
   // function is called. By using views_add_js the timing of the js files
@@ -213,7 +217,7 @@ function entityreference_browser_field_widget_form(&$form, &$form_state, $field,
 
   $selected_entities = entity_load($entity_type, $selected_entity_ids);
 
-  // Build HTML to represent selected items
+  // Build HTML to represent selected items.
   $markup_selected  = '<div class="entityreference-browser-widget-left"><ul data-ec="' . $ec . '" class="entityreference-browser entityreference-browser-selected">';
   foreach ($selected_entities as $id => $loaded_entity) {
     $remove_item_link = ' <a href="/node/' . $id . '" class="remove" data-id="' . $id . '">[remove]</a>';
diff --git a/views/entityreference_browser.views.inc b/views/entityreference_browser.views.inc
index 3cff2e3..2b65b26 100644
--- a/views/entityreference_browser.views.inc
+++ b/views/entityreference_browser.views.inc
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Alters the table structure.
+ */
 
 /**
  * Implements hook_views_data_alter().
diff --git a/views/entityreference_browser.views_default.inc b/views/entityreference_browser.views_default.inc
index b8491ca..6b5141c 100644
--- a/views/entityreference_browser.views_default.inc
+++ b/views/entityreference_browser.views_default.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * nova_magnet.views_default.inc
+ * Provides the default entity reference browser view.
  */
 
 /**
diff --git a/views/entityreference_browser_field_picker.inc b/views/entityreference_browser_field_picker.inc
index c66b209..59912db 100644
--- a/views/entityreference_browser_field_picker.inc
+++ b/views/entityreference_browser_field_picker.inc
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Contains the views field handler.
+ */
 
 /**
  * Field handler used in the Browser View. It creates a selectable link.
@@ -20,4 +24,4 @@ class entityreference_browser_field_picker extends views_handler_field {
   function render($values) {
     return "<a data-id=\"{$values->nid}\" href=\"/node/{$values->nid}\" class=\"picker\">{$values->node_title}</a>";
   }
-}
\ No newline at end of file
+}