diff --git a/feeds.module b/feeds.module
index 2eb43f1..e1c524c 100644
--- a/feeds.module
+++ b/feeds.module
@@ -4,7 +4,6 @@
  * @file
  * Feeds - basic API functions and hook implementations.
  */
-
 // Common request time, use as point of reference and to avoid calls to time().
 define('FEEDS_REQUEST_TIME', time());
 // Do not schedule a feed for refresh.
@@ -49,8 +48,8 @@ function feeds_hook_info() {
 function feeds_cron() {
   // Expire old log entries.
   db_delete('feeds_log')
-    ->condition('request_time', REQUEST_TIME - 604800, '<')
-    ->execute();
+      ->condition('request_time', REQUEST_TIME - 604800, '<')
+      ->execute();
 
   // Find importers that need to be rescheduled.
   if (!$importers = feeds_reschedule()) {
@@ -381,8 +380,12 @@ function feeds_importer_load($id) {
   try {
     return feeds_importer($id)->existing();
   }
-  catch (FeedsNotExistingException $e) {}
-  catch (InvalidArgumentException $e) {}
+  catch (FeedsNotExistingException $e) {
+    
+  }
+  catch (InvalidArgumentException $e) {
+    
+  }
 
   return FALSE;
 }
@@ -486,7 +489,7 @@ function feeds_exit() {
   foreach ($jobs as $job) {
     if (!isset($job['fetcher']) || !isset($job['source'])) {
       continue;
-     }
+    }
     $job['fetcher']->subscribe($job['source']);
   }
 
@@ -575,9 +578,9 @@ function feeds_entity_delete($entity, $type) {
 
   // Delete any imported items produced by the source.
   db_delete('feeds_item')
-    ->condition('entity_type', $type)
-    ->condition('entity_id', $id)
-    ->execute();
+      ->condition('entity_type', $type)
+      ->condition('entity_id', $id)
+      ->execute();
 }
 
 /**
@@ -843,7 +846,6 @@ function feeds_flush_caches() {
 /**
  * @}
  */
-
 /**
  * @defgroup utility Utility functions
  * @{
@@ -970,17 +972,17 @@ function feeds_log($importer_id, $feed_nid, $type, $message, $variables = array(
     $error = TRUE;
   }
   db_insert('feeds_log')
-    ->fields(array(
-      'id' => $importer_id,
-      'feed_nid' => $feed_nid,
-      'log_time' => time(),
-      'request_time' => REQUEST_TIME,
-      'type' => $type,
-      'message' => $message,
-      'variables' => serialize($variables),
-      'severity' => $severity,
-    ))
-    ->execute();
+      ->fields(array(
+        'id' => $importer_id,
+        'feed_nid' => $feed_nid,
+        'log_time' => time(),
+        'request_time' => REQUEST_TIME,
+        'type' => $type,
+        'message' => $message,
+        'variables' => serialize($variables),
+        'severity' => $severity,
+      ))
+      ->execute();
 }
 
 /**
@@ -992,11 +994,11 @@ function feeds_log($importer_id, $feed_nid, $type, $message, $variables = array(
  */
 function feeds_item_info_load($entity_type, $entity_id) {
   return db_select('feeds_item')
-    ->fields('feeds_item')
-    ->condition('entity_type', $entity_type)
-    ->condition('entity_id', $entity_id)
-    ->execute()
-    ->fetchObject();
+          ->fields('feeds_item')
+          ->condition('entity_type', $entity_type)
+          ->condition('entity_id', $entity_id)
+          ->execute()
+          ->fetchObject();
 }
 
 /**
@@ -1027,7 +1029,6 @@ function feeds_item_info_save($entity, $entity_id) {
 /**
  * @}
  */
-
 /**
  * @defgroup instantiators Instantiators
  * @{
@@ -1099,7 +1100,6 @@ function feeds_plugin($plugin, $id) {
 /**
  * @}
  */
-
 /**
  * @defgroup include Funtions for loading libraries
  * @{
@@ -1182,16 +1182,16 @@ function feeds_library_exists($file, $library) {
   return FALSE;
 }
 
- /**
+/**
  * Checks whether simplepie exists.
  */
 function feeds_simplepie_exists() {
   return (
-    feeds_library_exists('autoloader.php', 'simplepie') ||
-    feeds_library_exists('simplepie.compiled.php', 'simplepie') ||
-    feeds_library_exists('simplepie.mini.php', 'simplepie') ||
-    feeds_library_exists('simplepie.inc', 'simplepie')
-  );
+      feeds_library_exists('autoloader.php', 'simplepie') ||
+      feeds_library_exists('simplepie.compiled.php', 'simplepie') ||
+      feeds_library_exists('simplepie.mini.php', 'simplepie') ||
+      feeds_library_exists('simplepie.inc', 'simplepie')
+      );
 }
 
 /**
@@ -1333,7 +1333,7 @@ function feeds_entity_property_info_alter(&$info) {
  * Gets the feed_nid for an entity for use in entity metadata.
  */
 function feeds_get_feed_nid_entity_callback($entity, array $options, $name, $entity_type) {
-  list($entity_id, , ) = entity_extract_ids($entity_type, $entity);
+  list($entity_id,, ) = entity_extract_ids($entity_type, $entity);
 
   $feed_nid = NULL;
   if ($entity_id) {
@@ -1361,7 +1361,7 @@ function feeds_file_download($uri) {
     return;
   }
 
-   // Get the file record based on the URI. If not in the database just return.
+  // Get the file record based on the URI. If not in the database just return.
   $files = file_load_multiple(array(), array('uri' => $uri));
   foreach ($files as $item) {
     // Since some database servers sometimes use a case-insensitive comparison
diff --git a/feeds.rules.inc b/feeds.rules.inc
index dce753a..a31e75c 100644
--- a/feeds.rules.inc
+++ b/feeds.rules.inc
@@ -37,7 +37,7 @@ function feeds_rules_event_info() {
     $entity_type = $processor->entityType();
     $label = isset($entity_info[$entity_type]['label']) ? $entity_info[$entity_type]['label'] : $entity_type;
 
-    $info['feeds_import_'. $importer->id] = array(
+    $info['feeds_import_' . $importer->id] = array(
       'label' => t('Before saving an item imported via @name.', array('@name' => $importer->config['name'])),
       'group' => t('Feeds'),
       'variables' => array(
@@ -52,7 +52,7 @@ function feeds_rules_event_info() {
     );
     // Add bundle information if the node processor is used.
     if ($processor instanceof FeedsNodeProcessor) {
-      $info['feeds_import_'. $importer->id]['variables'][$entity_type]['bundle'] = $processor->bundle();
+      $info['feeds_import_' . $importer->id]['variables'][$entity_type]['bundle'] = $processor->bundle();
     }
   }
   return $info;
@@ -95,7 +95,7 @@ function feeds_rules_data_info() {
           'type' => 'date',
           'description' => t("The date the source was last imported."),
         ),
-        // @TODO: fetcher, parser, state ...
+      // @TODO: fetcher, parser, state ...
       ),
     ),
   );
diff --git a/plugins/FeedsHTTPFetcher.inc b/plugins/FeedsHTTPFetcher.inc
index cd91b63..bfc0a0c 100644
--- a/plugins/FeedsHTTPFetcher.inc
+++ b/plugins/FeedsHTTPFetcher.inc
@@ -4,7 +4,6 @@
  * @file
  * Home of the FeedsHTTPFetcher and related classes.
  */
-
 feeds_include_library('PuSHSubscriber.inc', 'PuSHSubscriber');
 
 /**
@@ -190,12 +189,12 @@ class FeedsHTTPFetcher extends FeedsFetcher {
       '#type' => 'textfield',
       '#title' => t('Request timeout'),
       '#description' => t('Timeout in seconds to wait for an HTTP get request to finish.</br>' .
-                         '<b>Note:</b> this setting will override the global setting.</br>' .
-                         'When left empty, the global value is used.'),
+          '<b>Note:</b> this setting will override the global setting.</br>' .
+          'When left empty, the global value is used.'),
       '#default_value' => $this->config['request_timeout'],
       '#element_validate' => array('element_validate_integer_positive'),
       '#maxlength' => 3,
-      '#size'=> 30,
+      '#size' => 30,
     );
     $form['advanced']['accept_invalid_cert'] = array(
       '#type' => 'checkbox',
@@ -322,12 +321,14 @@ class FeedsHTTPFetcher extends FeedsFetcher {
   protected function subscriber($subscriber_id) {
     return PushSubscriber::instance($this->id, $subscriber_id, 'PuSHSubscription', PuSHEnvironment::instance());
   }
+
 }
 
 /**
  * Implement a PuSHSubscriptionInterface.
  */
 class PuSHSubscription implements PuSHSubscriptionInterface {
+
   public $domain;
   public $subscriber_id;
   public $hub;
@@ -374,16 +375,18 @@ class PuSHSubscription implements PuSHSubscriptionInterface {
    */
   public function delete() {
     db_delete('feeds_push_subscriptions')
-      ->condition('domain', $this->domain)
-      ->condition('subscriber_id', $this->subscriber_id)
-      ->execute();
+        ->condition('domain', $this->domain)
+        ->condition('subscriber_id', $this->subscriber_id)
+        ->execute();
   }
+
 }
 
 /**
  * Provide environmental functions to the PuSHSubscriber library.
  */
 class PuSHEnvironment implements PuSHSubscriberEnvironmentInterface {
+
   /**
    * Singleton.
    */
@@ -420,4 +423,5 @@ class PuSHEnvironment implements PuSHSubscriberEnvironmentInterface {
     feeds_dbg($msg);
     watchdog('FeedsHTTPFetcher', $msg, array(), $severity);
   }
+
 }