diff --git a/views/votingapi.views.inc b/views/votingapi.views.inc
index 859e018..4c258fa 100644
--- a/views/votingapi.views.inc
+++ b/views/votingapi.views.inc
@@ -13,7 +13,7 @@
 
 
 /**
- * Implementation of hook_views_handlers().
+ * Implements of hook_views_handlers().
  */
 function votingapi_views_handlers() {
   return array(
@@ -36,7 +36,7 @@ function votingapi_views_handlers() {
 
 
 /**
- * Implementation of hook_views_data().
+ * Implements of hook_views_data().
  */
 function votingapi_views_data() {
   // Basic table information.
@@ -293,10 +293,10 @@ function votingapi_views_data_alter(&$views_data) {
   );
 
   foreach ($default_relationships as $data) {
-    $pseudo = str_replace(array(' ','-','.'), '_', $data['entity_type'] . '_' . $data['entity_id_column']);
-    $pseudo_vote = empty($data['pseudo_vote']) ? 'vapi_'. $pseudo : $data['pseudo_vote'];
-    $pseudo_cache = empty($data['pseudo_cache']) ? 'vapic_'. $pseudo : $data['pseudo_cache'];
-    
+    $pseudo = str_replace(array(' ', '-', '.'), '_', $data['entity_type'] . '_' . $data['entity_id_column']);
+    $pseudo_vote = empty($data['pseudo_vote']) ? 'vapi_' . $pseudo : $data['pseudo_vote'];
+    $pseudo_cache = empty($data['pseudo_cache']) ? 'vapic_' . $pseudo : $data['pseudo_cache'];
+
     $views_data[$data['base_table']][$pseudo_vote]['relationship'] = array(
       'title' => 'Votes',
       'help' => 'Votes cast by users on ' . $data['description'] . '.',
@@ -333,12 +333,12 @@ function votingapi_views_data_alter(&$views_data) {
 
 
 function _votingapi_views_sql_safe_entity_type($string) {
-  return str_replace(array(' ','-','.'), '_', $string);
+  return str_replace(array(' ', '-', '.'), '_', $string);
 }
 
 
 /**
- * Implementation of hook_views_analyze().
+ * Implements of hook_views_analyze().
  *
  * Warns admins if a VotingAPI relationship has been defined, but filters on the
  * relationship haven't been set.
diff --git a/views/votingapi.views_default.inc b/views/votingapi.views_default.inc
index a2bc296..172f87e 100644
--- a/views/votingapi.views_default.inc
+++ b/views/votingapi.views_default.inc
@@ -7,7 +7,7 @@
 
 function votingapi_views_default_views() {
   $views = array();
-    
+
   $view = new view;
   $view->name = 'top_content';
   $view->description = 'Top rated content';
diff --git a/views/votingapi_views_handler_field_value.inc b/views/votingapi_views_handler_field_value.inc
index 62d1cea..0296ff9 100644
--- a/views/votingapi_views_handler_field_value.inc
+++ b/views/votingapi_views_handler_field_value.inc
@@ -45,7 +45,7 @@ class votingapi_views_handler_field_value extends views_handler_field_numeric {
   function click_sort($order) {
     $this->query->add_orderby(NULL, "COALESCE($this->table_alias.$this->field, 0)", $order, $this->table_alias . '_' . $this->field . '_coalesced');
   }
-  
+
   function render($values) {
     $value = $values->{$this->field_alias};
     $function = $this->options['appearance'];
diff --git a/views/votingapi_views_handler_relationship.inc b/views/votingapi_views_handler_relationship.inc
index 29af5aa..af189f6 100644
--- a/views/votingapi_views_handler_relationship.inc
+++ b/views/votingapi_views_handler_relationship.inc
@@ -53,7 +53,7 @@ class votingapi_views_handler_relationship extends views_handler_relationship {
     $options['value_types'][''] = t('No filtering');
     $options['tags'][''] = t('No filtering');
     $options['functions'][''] = t('No filtering');
-    foreach(votingapi_metadata() as $bin => $bin_data) {
+    foreach (votingapi_metadata() as $bin => $bin_data) {
       foreach ($bin_data as $key => $data) {
         $options[$bin][$key] = $data['name'];
       }
@@ -131,7 +131,7 @@ class votingapi_views_handler_relationship extends views_handler_relationship {
             'value' => $value,
             'numeric' => FALSE
           );
-          $alias .= '_'. str_replace(array(' ','-','.'), '_', $value);
+          $alias .= '_' . str_replace(array(' ', '-', '.'), '_', $value);
         }
       }
     }
diff --git a/votingapi.drush.inc b/votingapi.drush.inc
index 85a6066..a04e47d 100644
--- a/votingapi.drush.inc
+++ b/votingapi.drush.inc
@@ -7,7 +7,7 @@
  */
 
 /**
- * Implementation of hook_drush_help().
+ * Implements of hook_drush_help().
  */
 function votingapi_drush_help($section) {
   switch ($section) {
@@ -21,7 +21,7 @@ function votingapi_drush_help($section) {
 }
 
 /**
- * Implementation of hook_drush_command().
+ * Implements of hook_drush_command().
  */
 function votingapi_drush_command() {
   $items['generate-votes'] = array(
diff --git a/votingapi.module b/votingapi.module
index 40204ff..fba62a4 100644
--- a/votingapi.module
+++ b/votingapi.module
@@ -11,7 +11,7 @@
  */
 
 /**
- * Implementation of hook_menu().
+ * Implements of hook_menu().
  */
 function votingapi_menu() {
   $items = array();
@@ -52,7 +52,7 @@ function votingapi_permission() {
 }
 
 /**
- * Implementation of hook_views_api().
+ * Implements of hook_views_api().
  */
 function votingapi_views_api() {
   return array(
@@ -62,7 +62,7 @@ function votingapi_views_api() {
 }
 
 /**
- * Implementation of hook_cron().
+ * Implements of hook_cron().
  *
  * Allows db-intensive recalculations to be deferred until cron-time.
  */
@@ -190,21 +190,21 @@ function votingapi_current_user_identifier() {
 }
 
 /**
- * Implementation of hook_votingapi_storage_add_vote().
+ * Implements of hook_votingapi_storage_add_vote().
  */
 function votingapi_votingapi_storage_add_vote(&$vote) {
   drupal_write_record('votingapi_vote', $vote);
 }
 
 /**
- * Implementation of hook_votingapi_storage_delete_votes().
+ * Implements of hook_votingapi_storage_delete_votes().
  */
 function votingapi_votingapi_storage_delete_votes($votes, $vids) {
   db_delete('votingapi_vote')->condition('vote_id', $vids, 'IN')->execute();
 }
 
 /**
- * Implementation of hook_votingapi_storage_select_votes().
+ * Implements of hook_votingapi_storage_select_votes().
  */
 function votingapi_votingapi_storage_select_votes($criteria, $limit) {
   $query = db_select('votingapi_vote')->fields('votingapi_vote');
@@ -552,7 +552,7 @@ function votingapi_votingapi_storage_standard_results($entity_type, $entity_id)
  */
 function votingapi_select_single_vote_value($criteria = array()) {
   if ($results = votingapi_select_votes($criteria, 1)) {
-     return $results[0]['value'];
+    return $results[0]['value'];
   }
 }
 
@@ -561,7 +561,7 @@ function votingapi_select_single_vote_value($criteria = array()) {
  */
 function votingapi_select_single_result_value($criteria = array()) {
   if ($results = votingapi_select_results($criteria, 1)) {
-     return $results[0]['value'];
+    return $results[0]['value'];
   }
 }