diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e4e5f6c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
\ No newline at end of file
diff --git a/USAGE.md b/USAGE.md
index 7fdd61a..04b414c 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -47,8 +47,8 @@ Rules Provided
 ###Action###
   - **Add url along with tags** : Addition of URL to Pocket. Optionally you can also provide tags
   - **Delete URL** : Deletion of URL from Pocket
-  - **Archive / Unarchive URL** : Two seperate actions are provided for archiving purpose.
-  - **Favorite / Unfavorite URL** : Two seperate actions are provided for favorite purpose
+  - **Archive / Unarchive URL** : Two separate actions are provided for archiving purpose.
+  - **Favorite / Unfavorite URL** : Two separate actions are provided for favorite purpose
   - **Adding Tags** : Action Add tags to an entry in the already existing tags.
   - **Replacing Tags** : Replace tags of an entry with new provided tags.
   - **Clearing Tags**: Clear all tags of an entry
@@ -90,10 +90,10 @@ Rules Provided
 - **Restrict by Type**: Article
 **Action** (Add URL to pocket)
 - **URL** : node:url
-- **Tags** : \<Comma seperated tags, if any\>
+- **Tags** : \<Comma separated tags, if any\>
 - **Pocket Account** : \<Select your e-mail address\>
 
-Similarly a rule can be added to delete or archive url in pocket everytime an Article is deleted on a drupal site.
+Similarly a rule can be added to delete or archive url in pocket every time an Article is deleted on a drupal site.
 
 ####Tweeting about your favorite articles in Pocket (also involves fluxtwitter)####
 **Event**
diff --git a/fluxpocket.info b/fluxpocket.info
index bcd9ab0..1804012 100644
--- a/fluxpocket.info
+++ b/fluxpocket.info
@@ -4,9 +4,4 @@ package = fluxkraft
 core = 7.x
 php = 5.3
 dependencies[] = fluxservice
-
-; Information added by drupal.org packaging script on 2013-10-28
-version = "7.x-1.x-dev"
-core = "7.x"
-project = "fluxlinkedin"
-datestamp = "1382986365"
+dependencies[] = rules_scheduler
\ No newline at end of file
diff --git a/fluxpocket.module b/fluxpocket.module
index 4615c60..d0b08c8 100644
--- a/fluxpocket.module
+++ b/fluxpocket.module
@@ -16,7 +16,7 @@ function fluxpocket_fluxservice_plugin_directory() {
  * Implements hook_rules_category_info().
  */
 function fluxpocket_rules_category_info() {
-  $info =  array();
+  $info = array();
   // Use the same icon as for the service plugin.
   $info['fluxpocket'] = array(
     'label' => t('Pocket'),
diff --git a/lib/Drupal/fluxpocket/Plugin/Entity/PocketEntry.php b/lib/Drupal/fluxpocket/Plugin/Entity/PocketEntry.php
index 3073a0f..cd5d69e 100644
--- a/lib/Drupal/fluxpocket/Plugin/Entity/PocketEntry.php
+++ b/lib/Drupal/fluxpocket/Plugin/Entity/PocketEntry.php
@@ -79,7 +79,6 @@ public static function getEntityPropertyInfo($entity_type, $entity_info) {
       'type' => 'text',
     );
 
-
     $info['resolved_title'] = array(
       'label' => t('Resolved Title'),
       'description' => t('The Resolved Title for the entry by Pocket'),
@@ -95,7 +94,7 @@ public static function getEntityPropertyInfo($entity_type, $entity_info) {
     $info['tags'] = array(
       'label' => t('Tags'),
       'description' => t('A collection of tags associated with the particular entry.'),
-      'type' => 'list<text>'
+      'type' => 'list<text>',
     );
 
     $info['favorite'] = array(
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Action/AddUrl.php b/lib/Drupal/fluxpocket/Plugin/Rules/Action/AddUrl.php
index 5f32190..37bb4f8 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Action/AddUrl.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Action/AddUrl.php
@@ -46,10 +46,12 @@ public static function getInfo() {
    */
   public function execute($page_url, $tags, PocketAccountInterface $account) {
     $client = $account->client();
-    //Structuring the array of url to be added
-    //Getting Tag List
-    $tag_ar = explode(",",$tags);
-    //Trimming spaces from array list
+
+    // Structuring the array of url to be added.
+    // Getting Tag List.
+    $tag_ar = explode(",", $tags);
+
+    // Trimming spaces from array list.
     $tag_ar = array_filter(array_map('trim', $tag_ar));
     $link_info = array(
       'url'       => $page_url,
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Action/Addtag.php b/lib/Drupal/fluxpocket/Plugin/Rules/Action/Addtag.php
index 7bb8335..e60978f 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Action/Addtag.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Action/Addtag.php
@@ -45,17 +45,19 @@ public static function getInfo() {
    */
   public function execute($page_url, $tags, PocketAccountInterface $account) {
     $client = $account->client();
-    //Structuring the array of tags to be added
-    //Getting Tag List
-    $tag_ar = explode(",",$tags);
-    //Trimming spaces from array list
+
+    // Structuring the array of tags to be added.
+    // Getting Tag List.
+    $tag_ar = explode(",", $tags);
+
+    // Trimming spaces from array list.
     $tag_ar = array_filter(array_map('trim', $tag_ar));
 
     $item_id = RetrieveBase::getItemIdFromUrl($client, $page_url);
 
     $tag_info = array(
       'item_id'   => $item_id,
-      'tags'      => $tag_ar
+      'tags'      => $tag_ar,
     );
 
     $pockpack_q = new PockpackQueue();
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Action/ArchiveUrl.php b/lib/Drupal/fluxpocket/Plugin/Rules/Action/ArchiveUrl.php
index 32404a0..c30ea84 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Action/ArchiveUrl.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Action/ArchiveUrl.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains ArchiveUrl
+ * Contains ArchiveUrl.
  */
 
 namespace Drupal\fluxpocket\Plugin\Rules\Action;
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Action/ClearTag.php b/lib/Drupal/fluxpocket/Plugin/Rules/Action/ClearTag.php
index 6b551d5..5383c7c 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Action/ClearTag.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Action/ClearTag.php
@@ -40,8 +40,8 @@ public static function getInfo() {
    */
   public function execute($page_url, PocketAccountInterface $account) {
     $client = $account->client();
-    //Structuring the array of url to be added
 
+    // Structuring the array of url to be added.
     $item_id = RetrieveBase::getItemIdFromUrl($client, $page_url);
 
     $pockpack_q = new PockpackQueue();
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Action/FavoriteUrl.php b/lib/Drupal/fluxpocket/Plugin/Rules/Action/FavoriteUrl.php
index b3f7c81..dec403a 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Action/FavoriteUrl.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Action/FavoriteUrl.php
@@ -13,7 +13,7 @@
 use Duellsy\Pockpack\PockpackQueue;
 
 /**
- * Action to add URL to favorites
+ * Action to add URL to favorites.
  */
 class FavoriteUrl extends RetrieveBase {
 
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Action/RemoveTag.php b/lib/Drupal/fluxpocket/Plugin/Rules/Action/RemoveTag.php
index 1f5120f..59845b7 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Action/RemoveTag.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Action/RemoveTag.php
@@ -45,17 +45,18 @@ public static function getInfo() {
    */
   public function execute($page_url, $tags, PocketAccountInterface $account) {
     $client = $account->client();
-    //Structuring the array of tags to be added
-    //Getting Tag List
-    $tag_ar = explode(",",$tags);
-    //Trimming spaces from array list
+    // Structuring the array of tags to be added.
+    // Getting Tag List.
+    $tag_ar = explode(",", $tags);
+
+    // Trimming spaces from array list
     $tag_ar = array_filter(array_map('trim', $tag_ar));
 
     $item_id = RetrieveBase::getItemIdFromUrl($client, $page_url);
 
     $tag_info = array(
       'item_id'   => $item_id,
-      'tags'      => $tag_ar
+      'tags'      => $tag_ar,
     );
 
     $pockpack_q = new PockpackQueue();
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Action/ReplaceTag.php b/lib/Drupal/fluxpocket/Plugin/Rules/Action/ReplaceTag.php
index afa7b9f..e64fb0e 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Action/ReplaceTag.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Action/ReplaceTag.php
@@ -45,17 +45,18 @@ public static function getInfo() {
    */
   public function execute($page_url, $tags, PocketAccountInterface $account) {
     $client = $account->client();
-    //Structuring the array of tags to be added
-    //Getting Tag List
-    $tag_ar = explode(",",$tags);
-    //Trimming spaces from array list
+    // Structuring the array of tags to be added.
+    // Getting Tag List.
+    $tag_ar = explode(",", $tags);
+
+    // Trimming spaces from array list.
     $tag_ar = array_filter(array_map('trim', $tag_ar));
 
     $item_id = RetrieveBase::getItemIdFromUrl($client, $page_url);
 
     $tag_info = array(
       'item_id'   => $item_id,
-      'tags'      => $tag_ar
+      'tags'      => $tag_ar,
     );
 
     $pockpack_q = new PockpackQueue();
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Action/RetrieveBase.php b/lib/Drupal/fluxpocket/Plugin/Rules/Action/RetrieveBase.php
index f03ecb5..6f134a5 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Action/RetrieveBase.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Action/RetrieveBase.php
@@ -17,7 +17,7 @@
 abstract class RetrieveBase extends RulesPluginHandlerBase implements \RulesActionHandlerInterface {
 
   /**
-   * Convert page url to the item id stored in Pocket
+   * Convert page url to the item id stored in Pocket.
    * @param object $client
    *    Object to connect to Pocket services.
    * @param string|null $page_url
@@ -34,7 +34,8 @@ public function getItemIdFromUrl($client, $page_url = NULL) {
     'detailType'    => 'simple'
     );
     $list = $client->retrieve($options);
-    //Calculate the item_id for the url
+
+    // Calculate the item_id for the url.
     $id = NULL;
     foreach ($list->{'list'} as $index => $elements) {
       if ($list->{'list'}->$index->{'given_url'} == $page_url) {
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Action/UnfavoriteUrl.php b/lib/Drupal/fluxpocket/Plugin/Rules/Action/UnfavoriteUrl.php
index 8faa9c7..fdf8ba5 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Action/UnfavoriteUrl.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Action/UnfavoriteUrl.php
@@ -13,7 +13,7 @@
 use Duellsy\Pockpack\PockpackQueue;
 
 /**
- * Action for Unfavoriting Url
+ * Action for Unfavoriting Url.
  */
 class UnfavoriteUrl extends RetrieveBase {
 
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Events/PocketEventsEntriesHandler.php b/lib/Drupal/fluxpocket/Plugin/Rules/Events/PocketEventsEntriesHandler.php
index 6009cfa..dbbc0db 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Events/PocketEventsEntriesHandler.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Events/PocketEventsEntriesHandler.php
@@ -10,7 +10,7 @@
 use Drupal\fluxpocket\Plugin\Service\PocketAccountInterface;
 
 /**
- * Event handler for addition of url to pocket
+ * Event handler for addition of url to pocket.
  */
 class PocketEventEntriesHandler extends PocketEventHandlerBase {
 
@@ -43,7 +43,7 @@ public function summary() {
     $account = entity_load_single('fluxservice_account', $settings['account']);
     if ($settings['account'] && $account) {
       return t('A new Entry appears on the Pocket of %account.', array(
-          '%account' => "{$account->label()}"
+          '%account' => "{$account->label()}",
       ));
     }
     return $this->eventInfo['label'];
diff --git a/lib/Drupal/fluxpocket/Plugin/Rules/Events/PocketEventsUpdateHandler.php b/lib/Drupal/fluxpocket/Plugin/Rules/Events/PocketEventsUpdateHandler.php
index 78dfff6..116dc6b 100644
--- a/lib/Drupal/fluxpocket/Plugin/Rules/Events/PocketEventsUpdateHandler.php
+++ b/lib/Drupal/fluxpocket/Plugin/Rules/Events/PocketEventsUpdateHandler.php
@@ -10,7 +10,7 @@
 use Drupal\fluxpocket\Plugin\Service\PocketAccountInterface;
 
 /**
- * Event handler for updation of url to pocket
+ * Event handler for updation of url to pocket.
  */
 class PocketEventUpdateHandler extends PocketEventHandlerBase {
 
@@ -43,7 +43,7 @@ public function summary() {
     $account = entity_load_single('fluxservice_account', $settings['account']);
     if ($settings['account'] && $account) {
       return t('A new Entry updated on the Pocket of %account.', array(
-          '%account' => "{$account->label()}"
+          '%account' => "{$account->label()}",
       ));
     }
     return $this->eventInfo['label'];
diff --git a/lib/Drupal/fluxpocket/Plugin/Service/PocketAccount.php b/lib/Drupal/fluxpocket/Plugin/Service/PocketAccount.php
index 97ee2ad..d751f7d 100644
--- a/lib/Drupal/fluxpocket/Plugin/Service/PocketAccount.php
+++ b/lib/Drupal/fluxpocket/Plugin/Service/PocketAccount.php
@@ -5,7 +5,6 @@
  * Contains PocketAccount.
  */
 
-
 namespace Drupal\fluxpocket\Plugin\Service;
 
 use Drupal\fluxpocket\Tasks\Exception;
@@ -41,19 +40,20 @@ public function prepareAccount() {
     $store = fluxservice_tempstore("fluxservice.account.{$this->bundle()}");
     $store->setIfNotExists($this->identifier(), $this);
     $plugin = $this->identifier();
-    //Using API to request token
+
+    // Using API to request token.
     $pock_auth = new PockpackAuth();
     $request_token = $pock_auth->connect($key);
     $_SESSION['fluxpocket-api'] = array(
       'request_token' => $request_token,
-      'consumer_key' => $key
+      'consumer_key' => $key,
     );
     unset($_GET['destination']);
     drupal_goto($path = "https://getpocket.com/auth/authorize?request_token={$request_token}&redirect_uri={$redirect}");
   }
 
   /**
-   * Loads Account for OAuth
+   * Loads Account for OAuth.
    *
    * @param string $key Consumer Key of the app
    * @param $plugin Plugin for the particular service
@@ -66,10 +66,10 @@ public static function getAccountForOAuthCallback($key, $plugin) {
   /**
    * Builds the URL to redirect to after visiting pocket for authentication.
    *
-   *
    * @return string
    *   The URL to redirect to after visiting the pocket OAauth endpoint for
    *   requesting access privileges from a user.
+   *
    */
   protected function getRedirectUrl() {
     return url("fluxservice/oauth/{$this->bundle()}/{$this->identifier()}", array('absolute' => TRUE));
@@ -82,7 +82,7 @@ public function client() {
     $service = $this->getService();
     return PocketClient::factory(array(
         'client_id' => $service->getConsumerKey(),
-        'access_token' => $this->getAccessToken()
+        'access_token' => $this->getAccessToken(),
     ));
   }
 
@@ -115,7 +115,7 @@ public function processOAuthCallback() {
     $request_token = $_SESSION['fluxpocket-api']['request_token'];
     $client = new PockPackAuth();
     $data = $client->receiveTokenAndUsername($key, $request_token);
-    $this->data->set('access_token',$data['access_token']);
+    $this->data->set('access_token', $data['access_token']);
     $_SESSION['fluxpocket-api']['access_token'] = $data['access_token'];
     $this->processAuthorizedAccount($data);
 
@@ -132,11 +132,12 @@ protected function processAuthorizedAccount(array $response) {
   }
 
   /**
-   * Returns access token after authorization
+   * Returns access token after authorization.
    *
-   * @return string Access token for the session
+   * @return string
+   *   Access token for the session
    */
-  public function getAccessToken(){
+  public function getAccessToken() {
     return $this->data->get('access_token');
   }
 
diff --git a/lib/Drupal/fluxpocket/Plugin/Service/PocketService.php b/lib/Drupal/fluxpocket/Plugin/Service/PocketService.php
index fd4b91c..ce27b9e 100644
--- a/lib/Drupal/fluxpocket/Plugin/Service/PocketService.php
+++ b/lib/Drupal/fluxpocket/Plugin/Service/PocketService.php
@@ -40,7 +40,7 @@ public function getDefaultSettings() {
   }
 
   /**
-   * Structure of form for the Pocket Service
+   * Structure of form for the Pocket Service.
    *
    * @param array $form_state
    *
diff --git a/lib/Drupal/fluxpocket/PocketEntryController.php b/lib/Drupal/fluxpocket/PocketEntryController.php
index d4c7d95..225588b 100644
--- a/lib/Drupal/fluxpocket/PocketEntryController.php
+++ b/lib/Drupal/fluxpocket/PocketEntryController.php
@@ -25,7 +25,7 @@ protected function loadFromService($ids, ServiceInterface $service, AccountInter
     $client = $account->client();
     $response = $client->retrieve(array(
                   'state' => 'all',
-                  'detailType' => 'simple'
+                  'detailType' => 'simple',
                 ));
     foreach ($ids as $id) {
       $url = $response->{'list'}->$id->{'given_url'};
diff --git a/lib/Drupal/fluxpocket/PocketEntryEntityQueryDriver.php b/lib/Drupal/fluxpocket/PocketEntryEntityQueryDriver.php
index 39023a6..a9bce68 100644
--- a/lib/Drupal/fluxpocket/PocketEntryEntityQueryDriver.php
+++ b/lib/Drupal/fluxpocket/PocketEntryEntityQueryDriver.php
@@ -30,6 +30,7 @@ protected function prepareExecute(\EntityFieldQuery $query) {
    * Make a request.
    *
    * @return array
+   *  The response received, containing the items in Pocket.
    */
   protected function makeRequest() {
     $response = $this->getAccount()->client()->retrieve($this->requestParameter);
diff --git a/lib/Drupal/fluxpocket/Tasks/PocketAddTask.php b/lib/Drupal/fluxpocket/Tasks/PocketAddTask.php
index a5b4afb..c5adbe3 100644
--- a/lib/Drupal/fluxpocket/Tasks/PocketAddTask.php
+++ b/lib/Drupal/fluxpocket/Tasks/PocketAddTask.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\fluxpocket\Tasks;
 /**
- * Pocket Task handler for handling new entries
+ * Pocket Task handler for handling new entries.
  */
 class PocketAddTask extends PocketTaskBase {
 
@@ -25,17 +25,16 @@ public function runTask() {
 
     $entries = $this->getList($account, $arguments, $time);
 
-    //1 is added inorder to skip the latest entry
+    // 1 is added inorder to skip the latest entry
     $updated_time = intval(end($entries)['time_updated']) + 1;
 
-    if ( $entries ) {
+    if ($entries) {
       $entries = fluxservice_entify_multiple($entries, 'fluxpocket_entry', $account);
       foreach ($entries as $entry) {
         rules_invoke_event($this->getEvent(), $account, $entry);
       }
 
       // Store the timestamp of the last item that was processed.
-      //$last = end($entries);
       $store->set($this->task['identifier'], $updated_time);
     }
     elseif (empty($arguments['since'])) {
@@ -71,21 +70,21 @@ protected function getRequestArguments() {
   }
 
   /**
-   *Retrieves the List for the particular task
-   *
+   * Retrieves the List for the particular task.
    */
-  protected function getList($account, $arguments, $time=null){
+  protected function getList($account, $arguments, $time = NULL){
     $response = $account->client()->retrieve($arguments);
 
-    //Converting to array (encoding the object as json and then decoding as array)
-    $entries = json_decode (json_encode ($response->{'list'}), true);
+    // Converting to array by
+    // encoding the object as json and then decoding as array.
+    $entries = json_decode(json_encode($response->{'list'}), TRUE);
 
-    //Editing tags for easy parsing
+    // Editing tags for easy parsing
     $tags = array();
 
-    foreach($entries as $index => $elements) {
-      if ( isset($entries[$index]['tags']) ) {
-        foreach($entries[$index]['tags'] as $tag => $name) {
+    foreach ($entries as $index => $elements) {
+      if (isset($entries[$index]['tags'])) {
+        foreach ($entries[$index]['tags'] as $tag => $name) {
           array_push($tags,$tag);
         }
       }
@@ -93,7 +92,7 @@ protected function getList($account, $arguments, $time=null){
       $tags = array();
     }
 
-    //Filtering out entries which are created before the updated time
+    // Filtering out entries which are created before the updated time.
     if ($time) {
       foreach ($entries as $index => $elements) {
         if ($entries[$index]['time_added'] < $time) {
diff --git a/lib/Drupal/fluxpocket/Tasks/PocketArchiveTask.php b/lib/Drupal/fluxpocket/Tasks/PocketArchiveTask.php
index c809adb..f18f7ef 100644
--- a/lib/Drupal/fluxpocket/Tasks/PocketArchiveTask.php
+++ b/lib/Drupal/fluxpocket/Tasks/PocketArchiveTask.php
@@ -19,7 +19,7 @@ protected function getRequestArguments() {
     $arguments = array(
       'state'         => 'archive',
       'detailType'    => 'complete',
-      'sort'          => 'oldest'
+      'sort'          => 'oldest',
     );
     // We store the remote identifier of the last Pocket Entry that was
     // processed so that we can benefit from the 'since_id' query argument.
@@ -39,7 +39,7 @@ protected function getRequestArguments() {
   /**
    * {@inheritdoc}
    */
-  protected function getTime($entries){
-    return intval($entries['time_read'])+1;
+  protected function getTime($entries) {
+    return intval($entries['time_read']) + 1;
   }
 }
diff --git a/lib/Drupal/fluxpocket/Tasks/PocketEntryTaskBase.php b/lib/Drupal/fluxpocket/Tasks/PocketEntryTaskBase.php
index c346c9b..b89c119 100644
--- a/lib/Drupal/fluxpocket/Tasks/PocketEntryTaskBase.php
+++ b/lib/Drupal/fluxpocket/Tasks/PocketEntryTaskBase.php
@@ -22,20 +22,17 @@ public function runTask() {
     $identifier = $this->task['identifier'];
     $account = $this->getAccount();
 
-
     $entries = $this->getList($account, $arguments);
 
-
     $updated_time = $this->getTime(end($entries));
 
-    if ( $entries ) {
+    if ($entries) {
       $entries = fluxservice_entify_multiple($entries, 'fluxpocket_entry', $account);
       foreach ($entries as $entry) {
         rules_invoke_event($this->getEvent(), $account, $entry);
       }
 
       // Store the timestamp of the last item that was processed.
-      //$last = end($entries);
       $store->set($this->task['identifier'], $updated_time);
     }
     elseif (empty($arguments['since'])) {
@@ -45,21 +42,21 @@ public function runTask() {
 
 
   /**
-   *Retrieves the List for the particular task
-   *
+   * Retrieves the List for the particular task.
    */
   protected function getList($account, $arguments) {
     $response = $account->client()->retrieve($arguments);
-    //Converting to array (encoding the object as json and then decoding as array)
-    $entries = json_decode (json_encode ($response->{'list'}) , true);
+    // Converting to array by
+    // encoding the object as json and then decoding as array.
+    $entries = json_decode(json_encode($response->{'list'}), TRUE);
 
-    //Editing tags for easy parsing
+    // Editing tags for easy parsing.
     $tags = array();
 
-    foreach($entries as $index => $elements) {
-      if ( isset($entries[$index]['tags']) ) {
-        foreach($entries[$index]['tags'] as $tag => $name) {
-          array_push($tags,$tag);
+    foreach ($entries as $index => $elements) {
+      if (isset($entries[$index]['tags'])) {
+        foreach ($entries[$index]['tags'] as $tag => $name) {
+          array_push($tags, $tag);
         }
       }
       $entries[$index]['tags'] = $tags;
@@ -71,7 +68,7 @@ protected function getList($account, $arguments) {
 
 
   /**
-   *Retrieves the corresponding time for particular task
+   * Retrieves the corresponding time for particular task.
    *
    * @param array $entries the retrieved list from pocket
    *
@@ -88,6 +85,4 @@ abstract protected function getTime($entries);
    */
   abstract protected function getRequestArguments();
 
-
-
 }
diff --git a/lib/Drupal/fluxpocket/Tasks/PocketFavoriteTask.php b/lib/Drupal/fluxpocket/Tasks/PocketFavoriteTask.php
index a69974d..53eebb4 100644
--- a/lib/Drupal/fluxpocket/Tasks/PocketFavoriteTask.php
+++ b/lib/Drupal/fluxpocket/Tasks/PocketFavoriteTask.php
@@ -40,8 +40,8 @@ protected function getRequestArguments() {
   /**
    * {@inheritdoc}
    */
-  protected function getTime($entries){
-    return intval($entries['time_favorited'])+1;
+  protected function getTime($entries) {
+    return intval($entries['time_favorited']) + 1;
   }
 
 }
diff --git a/lib/Drupal/fluxpocket/Tasks/PocketUpdatedTask.php b/lib/Drupal/fluxpocket/Tasks/PocketUpdatedTask.php
index 920ebb9..dc206f6 100644
--- a/lib/Drupal/fluxpocket/Tasks/PocketUpdatedTask.php
+++ b/lib/Drupal/fluxpocket/Tasks/PocketUpdatedTask.php
@@ -19,7 +19,7 @@ protected function getRequestArguments() {
     $arguments = array(
       'state'         => 'all',
       'detailType'    => 'complete',
-      'sort'          => 'oldest'
+      'sort'          => 'oldest',
     );
     // We store the remote identifier of the last Pocket Entry that was
     // processed so that we can benefit from the 'since_id' query argument.
@@ -39,7 +39,7 @@ protected function getRequestArguments() {
   /**
    * {@inheritdoc}
    */
-  protected function getTime($entries){
-    return intval($entries['time_updated'])+1;
+  protected function getTime($entries) {
+    return intval($entries['time_updated']) + 1;
   }
 }