diff --git a/addons/nodequeue_service/nodequeue_service.inc b/addons/nodequeue_service/nodequeue_service.inc
index 3fdcb60..16d963a 100644
--- a/addons/nodequeue_service/nodequeue_service.inc
+++ b/addons/nodequeue_service/nodequeue_service.inc
@@ -1,87 +1,89 @@
 <?php
-
-/**
- * @author Greg Harvey - http://www.drupaler.co.uk
- */
-
-/**
- * returns an array of available nodequeue "channels" available
- *
- * @return
- * array with key of nodequeue ids and all settings within
- */
-function nodequeue_service_get_nodequeues() {
-  if (module_exists('nodequeue')) {
+
+/**
+ * @file
+ * Miscellaneous functions for Nodequeue Service.
+ *
+ * @author Greg Harvey - http://www.drupaler.co.uk
+ */
+
+/**
+ * Returns an array of available nodequeue "channels" available.
+ *
+ * @return
+ * array with key of nodequeue ids and all settings within
+ */
+function nodequeue_service_get_nodequeues() {
+  if (module_exists('nodequeue')) {
     // Fetch all of the queues.
-
-    $queues = nodequeue_load_queues(nodequeue_get_all_qids(0));
-    if (empty($queues)) {
-      return services_error(t('Nodequeue available, but no nodequeues exist'));
-    }
-    else {
-      $availablequeues = array();
-      foreach ($queues as $queue) {
-        $availablequeues[$queue->qid]['qid'] = $queue->qid;
-        $availablequeues[$queue->qid]['title'] = $queue->title;
-        $availablequeues[$queue->qid]['subqueue_title'] = $queue->subqueue_title;
-        $availablequeues[$queue->qid]['size'] = $queue->size;
-        $availablequeues[$queue->qid]['link'] = $queue->link;
-        $availablequeues[$queue->qid]['link_remove'] = $queue->link_remove;
-        $availablequeues[$queue->qid]['owner'] = $queue->owner;
-        $availablequeues[$queue->qid]['show_in_ui'] = $queue->show_in_ui;
-        $availablequeues[$queue->qid]['show_in_tab'] = $queue->show_in_tab;
-        $availablequeues[$queue->qid]['show_in_links'] = $queue->show_in_links;
-        $availablequeues[$queue->qid]['reference'] = $queue->reference;
-        $availablequeues[$queue->qid]['reverse'] = $queue->reverse;
-        $availablequeues[$queue->qid]['subqueues'] = $queue->subqueues;
-        $availablequeues[$queue->qid]['types'] = $queue->types;
-        $availablequeues[$queue->qid]['roles'] = $queue->roles;
-        $availablequeues[$queue->qid]['count'] = $queue->count;
-      }
-    }
-    return $availablequeues;
-  }
-  else {
-    return services_error(t('Nodequeue module unavailable.'));
-  }
-}
-
-/**
- * returns an array of available subqueues by parent queue id
- *
- * @param $qid
- * integer representing the queue id of the parent nodequeue
- *
- * @return
- * array with key of subqueue ids and all settings within
- */
-function nodequeue_service_get_subqueues($qid) {
-  if (module_exists('nodequeue')) {
-    $subqueues = nodequeue_load_subqueues_by_queue($qid);
-    if (!empty($subqueues)) {
-      foreach ($subqueues as $subqueue) {
-        $availablequeues[$subqueue->sqid]['sqid'] = $subqueue->sqid;
-        $availablequeues[$subqueue->sqid]['qid'] = $qid;
-        $availablequeues[$subqueue->sqid]['reference'] = $subqueue->reference;
-        $availablequeues[$subqueue->sqid]['title'] = check_plain($subqueue->title);
-        $availablequeues[$subqueue->sqid]['count'] = $subqueue->count;
-      }
-      return $availablequeues;
-    }
-    else {
-      return services_error(t('Specified nodequeue has no subqueues.'));
-    }
-  }
-  else {
-    return services_error(t('Nodequeue module unavailable.'));
-  }
-}
-
-/**
- * access callback function for the nodequeue service
- */
-function nodequeue_service_get_nodequeues_access() {
-  if (user_access('get nodequeues')) {
-    return TRUE;
-  }
-}
+    $queues = nodequeue_load_queues(nodequeue_get_all_qids(0));
+    if (empty($queues)) {
+      return services_error(t('Nodequeue available, but no nodequeues exist.'));
+    }
+    else {
+      $availablequeues = array();
+      foreach ($queues as $queue) {
+        $availablequeues[$queue->qid]['qid'] = $queue->qid;
+        $availablequeues[$queue->qid]['title'] = $queue->title;
+        $availablequeues[$queue->qid]['subqueue_title'] = $queue->subqueue_title;
+        $availablequeues[$queue->qid]['size'] = $queue->size;
+        $availablequeues[$queue->qid]['link'] = $queue->link;
+        $availablequeues[$queue->qid]['link_remove'] = $queue->link_remove;
+        $availablequeues[$queue->qid]['owner'] = $queue->owner;
+        $availablequeues[$queue->qid]['show_in_ui'] = $queue->show_in_ui;
+        $availablequeues[$queue->qid]['show_in_tab'] = $queue->show_in_tab;
+        $availablequeues[$queue->qid]['show_in_links'] = $queue->show_in_links;
+        $availablequeues[$queue->qid]['reference'] = $queue->reference;
+        $availablequeues[$queue->qid]['reverse'] = $queue->reverse;
+        $availablequeues[$queue->qid]['subqueues'] = $queue->subqueues;
+        $availablequeues[$queue->qid]['types'] = $queue->types;
+        $availablequeues[$queue->qid]['roles'] = $queue->roles;
+        $availablequeues[$queue->qid]['count'] = $queue->count;
+      }
+    }
+    return $availablequeues;
+  }
+  else {
+    return services_error(t('Nodequeue module unavailable.'));
+  }
+}
+
+/**
+ * Returns an array of available subqueues by parent queue id.
+ *
+ * @param $qid
+ * integer representing the queue id of the parent nodequeue
+ *
+ * @return
+ * array with key of subqueue ids and all settings within
+ */
+function nodequeue_service_get_subqueues($qid) {
+  if (module_exists('nodequeue')) {
+    $subqueues = nodequeue_load_subqueues_by_queue($qid);
+    if (!empty($subqueues)) {
+      foreach ($subqueues as $subqueue) {
+        $availablequeues[$subqueue->sqid]['sqid'] = $subqueue->sqid;
+        $availablequeues[$subqueue->sqid]['qid'] = $qid;
+        $availablequeues[$subqueue->sqid]['reference'] = $subqueue->reference;
+        $availablequeues[$subqueue->sqid]['title'] = check_plain($subqueue->title);
+        $availablequeues[$subqueue->sqid]['count'] = $subqueue->count;
+      }
+      return $availablequeues;
+    }
+    else {
+      return services_error(t('Specified nodequeue has no subqueues.'));
+    }
+  }
+  else {
+    return services_error(t('Nodequeue module unavailable.'));
+  }
+}
+
+/**
+ * Access callback function for the nodequeue service.
+ */
+function nodequeue_service_get_nodequeues_access() {
+  if (user_access('get nodequeues')) {
+    return TRUE;
+  }
+}
diff --git a/addons/nodequeue_service/nodequeue_service.info b/addons/nodequeue_service/nodequeue_service.info
index 4e91674..5e9f712 100644
--- a/addons/nodequeue_service/nodequeue_service.info
+++ b/addons/nodequeue_service/nodequeue_service.info
@@ -1,9 +1,9 @@
+name = Nodequeue Service
+description = Provides a nodequeue service.
+package = Nodequeue
 core = 7.x
-dependencies[]  = services
-dependencies[]  = nodequeue
-description     = "Provides a nodequeue service."
-name            = "Nodequeue Service"
-package         = "Nodequeue"
+
+dependencies[] = services
+dependencies[] = nodequeue
 
 files[] = nodequeue_service.inc
-files[] = nodequeue_service.module
diff --git a/addons/nodequeue_service/nodequeue_service.module b/addons/nodequeue_service/nodequeue_service.module
index 9366dd6..150a841 100644
--- a/addons/nodequeue_service/nodequeue_service.module
+++ b/addons/nodequeue_service/nodequeue_service.module
@@ -1,6 +1,9 @@
 <?php
 
 /**
+ * @file
+ * Provides a nodequeue service.
+ *
  * @author Greg Harvey - http://www.drupaler.co.uk
  */
 
@@ -10,7 +13,7 @@
 function nodequeue_service_permission() {
   return array(
     'get nodequeues' => array(
-      'title' => t('get nodequeues'),
+      'title' => t('Get nodequeues'),
       'description' => t('TODO Add a description for get nodequeues'),
     ),
   );
@@ -36,9 +39,9 @@ function nodequeue_service_service() {
       '#file' => array('file' => 'inc', 'module' => 'nodequeue_service'),
       '#args'             => array(
         array(
-          '#name'           => 'qid',
-          '#type'           => 'int',
-          '#description'    => t('A parent nodequeue queue ID.'),
+          '#name' => 'qid',
+          '#type' => 'int',
+          '#description' => t('A parent nodequeue queue ID.'),
         ),
       ),
       '#return'   => 'struct',
@@ -46,4 +49,3 @@ function nodequeue_service_service() {
     ),
   );
 }
-
diff --git a/includes/nodequeue.actions.inc b/includes/nodequeue.actions.inc
index d00bd54..dc83115 100644
--- a/includes/nodequeue.actions.inc
+++ b/includes/nodequeue.actions.inc
@@ -58,7 +58,7 @@ function nodequeue_add_action_form($context) {
     );
   }
   else {
-    drupal_set_message(t('Please <a href="!url">create</a> a nodequeue first.', array('!url' => url('admin/structure/nodequeue'))));
+    drupal_set_message(t('Please <a href="@url">create</a> a nodequeue first.', array('@url' => url('admin/structure/nodequeue'))));
   }
   return $form;
 }
@@ -108,8 +108,8 @@ function action_nodequeue_add($op, $edit = array(), $node) {
       return array(
         'description' => t('Add to Nodequeues'),
         'type' => t('node'),
-        'batchable' => true,
-        'configurable' => true,
+        'batchable' => TRUE,
+        'configurable' => TRUE,
       );
       break;
 
@@ -161,7 +161,7 @@ function action_nodequeue_add($op, $edit = array(), $node) {
           );
       }
       else {
-        drupal_set_message(t('Please <a href="!url">create</a> a nodequeue first.', array('!url' => url('admin/structure/nodequeue'))));
+        drupal_set_message(t('Please <a href="@url">create</a> a nodequeue first.', array('@url' => url('admin/structure/nodequeue'))));
       }
       return $form;
 
@@ -240,8 +240,8 @@ function action_nodequeue_remove($op, $edit = array(), $node) {
       return array(
         'description' => t('Remove from Nodequeues'),
         'type' => t('node'),
-        'batchable' => true,
-        'configurable' => true,
+        'batchable' => TRUE,
+        'configurable' => TRUE,
       );
       break;
 
diff --git a/includes/nodequeue.admin.inc b/includes/nodequeue.admin.inc
index e0c6b97..f93f278 100644
--- a/includes/nodequeue.admin.inc
+++ b/includes/nodequeue.admin.inc
@@ -307,7 +307,7 @@ function nodequeue_edit_queue_form($form, &$form_state, $queue) {
     // If the $queue is a string - name of a queue type, basically - then we test that it's a valid queue type.
     $queue = strtolower($queue);
     if (!isset($info[$queue])) {
-      return false;
+      return FALSE;
     }
     drupal_set_title(t('Add @type', array('@type' => strtolower($info[$queue]['title']))), PASS_THROUGH);
     $queue = new nodequeue_queue($queue);
@@ -318,8 +318,8 @@ function nodequeue_edit_queue_form($form, &$form_state, $queue) {
 
   $form['description'] = array(
     '#type' => 'fieldset',
-    '#title' => $info[$queue->owner]['title'],
-    '#description' => $info[$queue->owner]['description'],
+    '#title' => filter_xss($info[$queue->owner]['title']),
+    '#description' => filter_xss($info[$queue->owner]['description']),
   );
 
   $form['title'] = array(
@@ -614,7 +614,7 @@ function nodequeue_admin_view($queue, $subqueue = array()) {
       return nodequeue_view_subqueues($queue);
     }
   }
-  else if ($subqueue->sqid) {
+  elseif ($subqueue->sqid) {
     if (!nodequeue_api_subqueue_access($subqueue, NULL, $queue)) {
       return drupal_not_found();
     }
@@ -644,7 +644,7 @@ function nodequeue_arrange_subqueue($queue, $subqueue = NULL) {
       return drupal_not_found();
     }
   }
-  else if ($subqueue->sqid) {
+  elseif ($subqueue->sqid) {
     if (!nodequeue_api_subqueue_access($subqueue, NULL, $queue)) {
       return drupal_not_found();
     }
@@ -837,7 +837,7 @@ function nodequeue_arrange_subqueue_form_submit($form, &$form_state, $reverse =
     }
   }
 
-  $message = t('The queue has been updated.');
+  $message = 'The queue has been updated.';
 
   if ($reverse || $shuffle) {
     $keys = array_keys($nodes);
@@ -846,13 +846,13 @@ function nodequeue_arrange_subqueue_form_submit($form, &$form_state, $reverse =
     // reverse the list if the reverse button was pressed
     if ($reverse) {
       $values = array_reverse($values);
-      $message = t('The queue has been reversed.');
+      $message = 'The queue has been reversed.';
     }
 
     // shuffle the list if the shuffle button was pressed.
     if ($shuffle) {
       shuffle($values);
-      $message = t('The queue has been shuffled.');
+      $message = 'The queue has been shuffled.';
     }
 
     $nodes = array_combine($keys, $values);
@@ -862,7 +862,7 @@ function nodequeue_arrange_subqueue_form_submit($form, &$form_state, $reverse =
   $sqid = $form['nodes']['#subqueue']['sqid'];
   nodequeue_save_subqueue_order($nodes, $qid, $sqid);
 
-  drupal_set_message($message);
+  drupal_set_message(t('@message', array('@message' => $message)));
 }
 
 /**
@@ -898,7 +898,7 @@ function nodequeue_save_subqueue_order($nodes, $qid, $sqid) {
       $clean[$count] = $node;
       $count++;
     }
-    else if ($pos == 'r') {
+    elseif ($pos == 'r') {
       // call nodequeue_remove hook
       module_invoke_all('nodequeue_remove', $sqid, $node['nid']);
     }
diff --git a/includes/views/nodequeue.views_default.inc b/includes/views/nodequeue.views_default.inc
index 961034d..ea285da 100644
--- a/includes/views/nodequeue.views_default.inc
+++ b/includes/views/nodequeue.views_default.inc
@@ -195,4 +195,3 @@ function nodequeue_views_default_views() {
   }
   return $views;
 }
-
diff --git a/includes/views/nodequeue_handler_argument_subqueue_qid.inc b/includes/views/nodequeue_handler_argument_subqueue_qid.inc
index bf9a0f5..f3637b5 100644
--- a/includes/views/nodequeue_handler_argument_subqueue_qid.inc
+++ b/includes/views/nodequeue_handler_argument_subqueue_qid.inc
@@ -1,7 +1,11 @@
 <?php
+
 /**
+ * @file
  * Argument handler for subqueues.
- *
+ */
+
+/**
  * Subqueues have titles that are determined by doing substitution from
  * the subqueue_title on the queue using the title on the subqueue, which
  * takes a little extra work to do here.
diff --git a/includes/views/nodequeue_handler_field_all_queues.inc b/includes/views/nodequeue_handler_field_all_queues.inc
index 257dd68..82d935e 100644
--- a/includes/views/nodequeue_handler_field_all_queues.inc
+++ b/includes/views/nodequeue_handler_field_all_queues.inc
@@ -1,12 +1,14 @@
 <?php
+
 /**
+ * @file
  * Field handler for all queues.
  *
  * @ingroup views_field_handlers
  */
 class nodequeue_handler_field_all_queues extends views_handler_field_prerender_list {
   /**
-   * Provide meaningful defaults
+   * Provide meaningful defaults.
    */
   function options(&$options) {
     parent::options($options);
@@ -78,4 +80,3 @@ class nodequeue_handler_field_all_queues extends views_handler_field_prerender_l
     }
   }
 }
-
diff --git a/includes/views/nodequeue_handler_field_all_subqueues.inc b/includes/views/nodequeue_handler_field_all_subqueues.inc
index c44c991..6fa29f5 100644
--- a/includes/views/nodequeue_handler_field_all_subqueues.inc
+++ b/includes/views/nodequeue_handler_field_all_subqueues.inc
@@ -1,5 +1,7 @@
 <?php
+
 /**
+ * @file
  * Field handler for all subqueues
  *
  * @ingroup views_field_handlers
diff --git a/includes/views/nodequeue_handler_field_links.inc b/includes/views/nodequeue_handler_field_links.inc
index f25ff0f..d1aa04c 100644
--- a/includes/views/nodequeue_handler_field_links.inc
+++ b/includes/views/nodequeue_handler_field_links.inc
@@ -1,5 +1,7 @@
 <?php
+
 /**
+ * @file
  * Views field handler for the nodequeue queue links
  */
 class nodequeue_handler_field_links extends views_handler_field_node_link {
diff --git a/includes/views/nodequeue_handler_field_queue_tab.inc b/includes/views/nodequeue_handler_field_queue_tab.inc
index 0732770..25441e9 100644
--- a/includes/views/nodequeue_handler_field_queue_tab.inc
+++ b/includes/views/nodequeue_handler_field_queue_tab.inc
@@ -1,5 +1,7 @@
 <?php
+
 /**
+ * @file
  * Views field handler for the nodequeue queue links
  */
 class nodequeue_handler_field_queue_tab extends views_handler_field_node_link {
diff --git a/includes/views/nodequeue_handler_filter_in_queue.inc b/includes/views/nodequeue_handler_filter_in_queue.inc
index 5b7c289..2d2f502 100644
--- a/includes/views/nodequeue_handler_filter_in_queue.inc
+++ b/includes/views/nodequeue_handler_filter_in_queue.inc
@@ -1,5 +1,7 @@
 <?php
+
 /**
+ * @file
  * Handler to filter for nodes that are not in a queue.
  */
 class nodequeue_handler_filter_in_queue extends views_handler_filter_boolean_operator {
diff --git a/includes/views/nodequeue_handler_relationship_nodequeue.inc b/includes/views/nodequeue_handler_relationship_nodequeue.inc
index 5f01029..768f612 100644
--- a/includes/views/nodequeue_handler_relationship_nodequeue.inc
+++ b/includes/views/nodequeue_handler_relationship_nodequeue.inc
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Specialized relationship handler to add nodequeues.
  */
 class nodequeue_handler_relationship_nodequeue extends views_handler_relationship {
diff --git a/nodequeue.install b/nodequeue.install
index 5e998ac..379faec 100644
--- a/nodequeue.install
+++ b/nodequeue.install
@@ -261,7 +261,9 @@ function nodequeue_update_6003() {
   $ret = array();
   $invalid = db_query("SELECT count(nid) FROM {nodequeue_nodes} WHERE nid = 0")->fetchField();
   if (!empty($invalid)) {
-    db_query("DELETE FROM {nodequeue_nodes} WHERE nid = 0");
+    db_delete('nodequeue_nodes')
+    ->condition('nid', 0)
+    ->execute();
     $t = get_t();
     $ret[] = array('success' => TRUE, 'query' => $t("Deleted @invalid invalid entries from the {nodequeue_nodes} table.", array('@invalid' => $invalid)));
   }
@@ -305,8 +307,8 @@ function nodequeue_update_7200() {
       'nodequeue_subqueue' => array('qid', 'reference', 'title'),
       'nodequeue_nodes' => array('sqid', 'qid_nid'),
     );
-    foreach($del_indices as $table => $indices) {
-      foreach($indices as $k => $index) {
+    foreach ($del_indices as $table => $indices) {
+      foreach ($indices as $k => $index) {
         db_drop_index($table, $table . "_" . $index . "_idx");
       }
     }
@@ -334,8 +336,8 @@ function nodequeue_update_7200() {
          'nid' => array('nid'),
        ),
     );
-    foreach($add_indexes as $table => $indices) {
-      foreach($indices as $name => $columns) {
+    foreach ($add_indexes as $table => $indices) {
+      foreach ($indices as $name => $columns) {
         db_add_index($table, $name, $columns);
       }
     }
diff --git a/nodequeue.js b/nodequeue.js
index 6faee09..194a96b 100644
--- a/nodequeue.js
+++ b/nodequeue.js
@@ -346,7 +346,7 @@ Drupal.nodequeue = function(base, settings) {
               }
             },
             error: function(data) {
-              alert('An error occurred');
+              alert(Drupal.t('An error occurred'));
               $(input).parent().removeClass('throbbing');
               $(input).attr('disabled', false);
             }
diff --git a/nodequeue.module b/nodequeue.module
index a74c9fc..396e614 100644
--- a/nodequeue.module
+++ b/nodequeue.module
@@ -281,7 +281,7 @@ function nodequeue_node_view($node, $view_mode) {
           'purl' => array('disabled' => TRUE),
         );
       }
-      else if ($queue->link_remove) {
+      elseif ($queue->link_remove) {
         $links[$class] = array(
           'title' => nodequeue_title_substitute($queue->link_remove, $queue, $subqueue),
           'href' => "nodequeue/$queue->qid/remove-node/$subqueue->sqid/$id",
@@ -663,12 +663,12 @@ function nodequeue_load_queues($qids = array(), $bypass_cache = FALSE) {
       $loaded[$queue->qid]->count = 0;
     }
 
-    $result = db_query("SELECT qid, rid FROM {nodequeue_roles} WHERE qid IN (:to_load)", array(':to_load' =>$to_load));
+    $result = db_query("SELECT qid, rid FROM {nodequeue_roles} WHERE qid IN (:to_load)", array(':to_load' => $to_load));
     foreach ($result as $obj) {
       $loaded[$obj->qid]->roles[] = $obj->rid;
     }
 
-    $result = db_query("SELECT qid, type FROM {nodequeue_types} WHERE qid IN (:to_load)", array(':to_load' =>$to_load));
+    $result = db_query("SELECT qid, type FROM {nodequeue_types} WHERE qid IN (:to_load)", array(':to_load' => $to_load));
     foreach ($result as $obj) {
       $loaded[$obj->qid]->types[] = $obj->type;
     }
@@ -1413,7 +1413,7 @@ function nodequeue_subqueue_size_text($max, $count, $long = TRUE) {
   if (empty($count)) {
     $message = theme('nodequeue_subqueue_empty_text');
   }
-  else if ($count == $max) {
+  elseif ($count == $max) {
     $message = theme('nodequeue_subqueue_full_text');
   }
   else {
@@ -1506,7 +1506,7 @@ function nodequeue_nodequeue_form_submit(&$queue, $form_state) {
 /**
  * in general it's preferable to use Views for this functionality.
  */
-function nodequeue_node_titles($sqid, $title = '', $backward = true, $from = 0, $count = 0, $published_only = TRUE) {
+function nodequeue_node_titles($sqid, $title = '', $backward = TRUE, $from = 0, $count = 0, $published_only = TRUE) {
   $orderby = ($backward ? "DESC" : "ASC");
   $query = db_select('node', 'n')
     ->fields('n', array('nid', 'title'))