diff --git a/RoboFile.php b/RoboFile.php
index e701b8f872..21823c3f89 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -443,10 +443,10 @@ class RoboFile extends \Robo\Tasks {
     if(!is_readable($plugin_dist_file)) {
       $this->say("Failed to access " . $plugin_dist_file);
       return;
-    } elseif(!file_exists($svn_dir . "/.svn/")) {
+    } elseif (!file_exists($svn_dir . "/.svn/")) {
       $this->say("$svn_dir/.svn/ dir not found, is it a SVN repository?");
       return;
-    } elseif(file_exists($svn_dir . "/tags/" . $plugin_version)) {
+    } elseif (file_exists($svn_dir . "/tags/" . $plugin_version)) {
       $this->say("A SVN tag already exists: " . $plugin_version);
       return;
     }
diff --git a/lib/API/JSON/API.php b/lib/API/JSON/API.php
index 48012a60a4..04920fcd86 100644
--- a/lib/API/JSON/API.php
+++ b/lib/API/JSON/API.php
@@ -115,7 +115,7 @@ class API {
       $error_message = __('Invalid API request.', 'mailpoet');
       $error_response = $this->createErrorResponse(Error::BAD_REQUEST, $error_message, Response::STATUS_BAD_REQUEST);
       return $error_response;
-    } else if(!empty($this->_endpoint_namespaces[$this->_request_api_version])) {
+    } else if (!empty($this->_endpoint_namespaces[$this->_request_api_version])) {
       foreach ($this->_endpoint_namespaces[$this->_request_api_version] as $namespace) {
         $endpoint_class = sprintf(
           '%s\%s',
diff --git a/lib/API/JSON/v1/Newsletters.php b/lib/API/JSON/v1/Newsletters.php
index 4e7cf1fc12..b1d97a528b 100644
--- a/lib/API/JSON/v1/Newsletters.php
+++ b/lib/API/JSON/v1/Newsletters.php
@@ -414,18 +414,18 @@ class Newsletters extends APIEndpoint {
           ->withSegments(true)
           ->withSendingQueue()
           ->withStatistics();
-      } else if($newsletter->type === Newsletter::TYPE_WELCOME || $newsletter->type === Newsletter::TYPE_AUTOMATIC) {
+      } else if ($newsletter->type === Newsletter::TYPE_WELCOME || $newsletter->type === Newsletter::TYPE_AUTOMATIC) {
         $newsletter
           ->withOptions()
           ->withTotalSent()
           ->withScheduledToBeSent()
           ->withStatistics();
-      } else if($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
+      } else if ($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
         $newsletter
           ->withOptions()
           ->withSegments(true)
           ->withChildrenCount();
-      } else if($newsletter->type === Newsletter::TYPE_NOTIFICATION_HISTORY) {
+      } else if ($newsletter->type === Newsletter::TYPE_NOTIFICATION_HISTORY) {
         $newsletter
           ->withSegments(true)
           ->withSendingQueue()
diff --git a/lib/API/JSON/v1/Services.php b/lib/API/JSON/v1/Services.php
index bd4b83fadc..b6fed19d74 100644
--- a/lib/API/JSON/v1/Services.php
+++ b/lib/API/JSON/v1/Services.php
@@ -48,7 +48,7 @@ class Services extends APIEndpoint {
     $success_message = null;
     if($state == Bridge::KEY_VALID) {
       $success_message = __('Your MailPoet Sending Service key has been successfully validated.', 'mailpoet');
-    } elseif($state == Bridge::KEY_EXPIRING) {
+    } elseif ($state == Bridge::KEY_EXPIRING) {
       $success_message = sprintf(
         __('Your MailPoet Sending Service key expires on %s!', 'mailpoet'),
         $this->date_time->formatDate(strtotime($result['data']['expire_at']))
@@ -110,7 +110,7 @@ class Services extends APIEndpoint {
     $success_message = null;
     if($state == Bridge::KEY_VALID) {
       $success_message = __('Your Premium key has been successfully validated.', 'mailpoet');
-    } elseif($state == Bridge::KEY_EXPIRING) {
+    } elseif ($state == Bridge::KEY_EXPIRING) {
       $success_message = sprintf(
         __('Your Premium key expires on %s.', 'mailpoet'),
         $this->date_time->formatDate(strtotime($result['data']['expire_at']))
diff --git a/lib/API/JSON/v1/Subscribers.php b/lib/API/JSON/v1/Subscribers.php
index 5bc6296897..0baec30681 100644
--- a/lib/API/JSON/v1/Subscribers.php
+++ b/lib/API/JSON/v1/Subscribers.php
@@ -201,7 +201,7 @@ class Subscribers extends APIEndpoint {
           if($form['settings']['on_success'] === 'page') {
             // redirect to a page on a success, pass the page url in the meta
             $meta['redirect_url'] = get_permalink($form['settings']['success_page']);
-          } else if($form['settings']['on_success'] === 'url') {
+          } else if ($form['settings']['on_success'] === 'url') {
             $meta['redirect_url'] = $form['settings']['success_url'];
           }
         }
diff --git a/lib/Config/ServicesChecker.php b/lib/Config/ServicesChecker.php
index f82320bae8..de6ddc7726 100644
--- a/lib/Config/ServicesChecker.php
+++ b/lib/Config/ServicesChecker.php
@@ -42,7 +42,7 @@ class ServicesChecker {
         WPNotice::displayError($error);
       }
       return false;
-    } elseif($mss_key['state'] == Bridge::KEY_EXPIRING
+    } elseif ($mss_key['state'] == Bridge::KEY_EXPIRING
       && !empty($mss_key['data']['expire_at'])
     ) {
       if($display_error_notice) {
@@ -57,7 +57,7 @@ class ServicesChecker {
         WPNotice::displayWarning($error);
       }
       return true;
-    } elseif($mss_key['state'] == Bridge::KEY_VALID) {
+    } elseif ($mss_key['state'] == Bridge::KEY_VALID) {
       return true;
     }
 
@@ -95,7 +95,7 @@ class ServicesChecker {
         WPNotice::displayWarning($error);
       }
       return false;
-    } elseif($premium_key['state'] === Bridge::KEY_EXPIRING
+    } elseif ($premium_key['state'] === Bridge::KEY_EXPIRING
       && !empty($premium_key['data']['expire_at'])
     ) {
       if($display_error_notice) {
@@ -110,7 +110,7 @@ class ServicesChecker {
         WPNotice::displayWarning($error);
       }
       return true;
-    } elseif($premium_key['state'] === Bridge::KEY_VALID) {
+    } elseif ($premium_key['state'] === Bridge::KEY_VALID) {
       return true;
     }
 
diff --git a/lib/Cron/Workers/Scheduler.php b/lib/Cron/Workers/Scheduler.php
index a327d29ad9..01333bbc73 100644
--- a/lib/Cron/Workers/Scheduler.php
+++ b/lib/Cron/Workers/Scheduler.php
@@ -38,15 +38,15 @@ class Scheduler {
       $newsletter = Newsletter::findOneWithOptions($queue->newsletter_id);
       if(!$newsletter || $newsletter->deleted_at !== null) {
         $queue->delete();
-      } elseif($newsletter->status !== Newsletter::STATUS_ACTIVE && $newsletter->status !== Newsletter::STATUS_SCHEDULED) {
+      } elseif ($newsletter->status !== Newsletter::STATUS_ACTIVE && $newsletter->status !== Newsletter::STATUS_SCHEDULED) {
         continue;
-      } elseif($newsletter->type === Newsletter::TYPE_WELCOME) {
+      } elseif ($newsletter->type === Newsletter::TYPE_WELCOME) {
         $this->processWelcomeNewsletter($newsletter, $queue);
-      } elseif($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
+      } elseif ($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
         $this->processPostNotificationNewsletter($newsletter, $queue);
-      } elseif($newsletter->type === Newsletter::TYPE_STANDARD) {
+      } elseif ($newsletter->type === Newsletter::TYPE_STANDARD) {
         $this->processScheduledStandardNewsletter($newsletter, $queue);
-      } elseif($newsletter->type === Newsletter::TYPE_AUTOMATIC) {
+      } elseif ($newsletter->type === Newsletter::TYPE_AUTOMATIC) {
         $this->processScheduledAutomaticEmail($newsletter, $queue);
       }
       CronHelper::enforceExecutionLimit($this->timer);
diff --git a/lib/Form/Block/Date.php b/lib/Form/Block/Date.php
index a264262e8e..5739288051 100644
--- a/lib/Form/Block/Date.php
+++ b/lib/Form/Block/Date.php
@@ -77,7 +77,7 @@ class Date extends Base {
         $html .= 'name="'.$field_name.'[day]" placeholder="'.__('Day', 'mailpoet').'">';
         $html .= static::getDays($block);
         $html .= '</select>';
-      } else if($date_selector === 'MM') {
+      } else if ($date_selector === 'MM') {
         $block['selected'] = $month;
         $html .= '<select class="mailpoet_select mailpoet_date_month" ';
         $html .= static::getInputValidation($block, array(
@@ -86,7 +86,7 @@ class Date extends Base {
         $html .= 'name="'.$field_name.'[month]" placeholder="'.__('Month', 'mailpoet').'">';
         $html .= static::getMonths($block);
         $html .= '</select>';
-      } else if($date_selector === 'YYYY') {
+      } else if ($date_selector === 'YYYY') {
         $block['selected'] = $year;
         $html .= '<select class="mailpoet_date_year" ';
         $html .= static::getInputValidation($block, array(
@@ -224,14 +224,14 @@ class Date extends Base {
           'month' => $parsed_date[$month_position],
           'day' => $parsed_date[$day_position]
         );
-      } else if(count($parsed_date) === 2) {
+      } else if (count($parsed_date) === 2) {
         // create date from any combination of month and year
         $parsed_date = array(
           'year' => $parsed_date[$year_position],
           'month' => $parsed_date[$month_position],
           'day' => '01'
         );
-      } else if($date_format === 'MM' && count($parsed_date) === 1) {
+      } else if ($date_format === 'MM' && count($parsed_date) === 1) {
         // create date from month
         if((int)$parsed_date[$month_position] === 0) {
           $datetime = '';
@@ -243,7 +243,7 @@ class Date extends Base {
             'year' => date('Y')
           );
         }
-      } else if($date_format === 'YYYY' && count($parsed_date) === 1) {
+      } else if ($date_format === 'YYYY' && count($parsed_date) === 1) {
         // create date from year
         if((int)$parsed_date[$year_position] === 0) {
           $datetime = '';
diff --git a/lib/Models/ModelValidator.php b/lib/Models/ModelValidator.php
index d6924a6864..8ac172826a 100644
--- a/lib/Models/ModelValidator.php
+++ b/lib/Models/ModelValidator.php
@@ -39,7 +39,7 @@ class ModelValidator extends \Sudzy\Engine {
   function validateRenderedNewsletterBody($newsletter_body) {
     if(is_serialized($newsletter_body)) {
       $newsletter_body = unserialize($newsletter_body);
-    } else if(Helpers::isJson($newsletter_body)) {
+    } else if (Helpers::isJson($newsletter_body)) {
       $newsletter_body = json_decode($newsletter_body, true);
     }
     return (is_null($newsletter_body) || (is_array($newsletter_body) && !empty($newsletter_body['html']) && !empty($newsletter_body['text'])));
diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php
index 16c38e688f..dea8eb61e4 100644
--- a/lib/Models/Subscriber.php
+++ b/lib/Models/Subscriber.php
@@ -41,7 +41,7 @@ class Subscriber extends Model {
   static function findOne($id = false) {
     if(is_int($id) || (string)(int)$id === $id) {
       return parent::findOne($id);
-    } else if(strlen(trim($id)) > 0) {
+    } else if (strlen(trim($id)) > 0) {
       return parent::where('email', $id)->findOne();
     }
     return false;
@@ -323,7 +323,7 @@ class Subscriber extends Model {
   static function groupBy($orm, $group = null) {
     if($group === 'trash') {
       return $orm->whereNotNull('deleted_at');
-    } else if($group === 'all') {
+    } else if ($group === 'all') {
       return $orm->whereNull('deleted_at');
     } else {
       return $orm->filter($group);
diff --git a/lib/Newsletter/Editor/MetaInformationManager.php b/lib/Newsletter/Editor/MetaInformationManager.php
index 6a2f26199d..eb4bdb2bb2 100644
--- a/lib/Newsletter/Editor/MetaInformationManager.php
+++ b/lib/Newsletter/Editor/MetaInformationManager.php
@@ -29,7 +29,7 @@ class MetaInformationManager {
       if(!empty($text)) {
         $text = '<p>' . implode('<br />', $text) . '</p>';
         if($position === 'above') $content = $text . $content;
-        else if($position === 'below') $content .= $text;
+        else if ($position === 'below') $content .= $text;
       }
     }
 
diff --git a/lib/Newsletter/Editor/PostContentManager.php b/lib/Newsletter/Editor/PostContentManager.php
index 830213f32b..354a588c0a 100644
--- a/lib/Newsletter/Editor/PostContentManager.php
+++ b/lib/Newsletter/Editor/PostContentManager.php
@@ -20,7 +20,7 @@ class PostContentManager {
   function getContent($post, $displayType) {
     if($displayType === 'titleOnly') {
       return '';
-    } elseif($displayType === 'excerpt') {
+    } elseif ($displayType === 'excerpt') {
       // get excerpt
       if(!empty($post->post_excerpt)) {
         return self::stripShortCodes($post->post_excerpt);
diff --git a/lib/Newsletter/Editor/PostTransformer.php b/lib/Newsletter/Editor/PostTransformer.php
index 40b4cef96e..945d23528e 100644
--- a/lib/Newsletter/Editor/PostTransformer.php
+++ b/lib/Newsletter/Editor/PostTransformer.php
@@ -210,7 +210,7 @@ class PostTransformer {
 
     if(in_array($this->args['titleFormat'], array('h1', 'h2', 'h3'))) {
       $tag = $this->args['titleFormat'];
-    } elseif($this->args['titleFormat'] === 'ul') {
+    } elseif ($this->args['titleFormat'] === 'ul') {
       $tag = 'li';
       $top_padding = '0';
     } else {
diff --git a/lib/Newsletter/Editor/StructureTransformer.php b/lib/Newsletter/Editor/StructureTransformer.php
index 400c8e58a0..ad7413789b 100644
--- a/lib/Newsletter/Editor/StructureTransformer.php
+++ b/lib/Newsletter/Editor/StructureTransformer.php
@@ -88,9 +88,9 @@ class StructureTransformer {
     $alignItem = $image->hasParent('figure') ? $image->parent : $image;
     if($alignItem->hasClass('aligncenter')) {
       $align = 'center';
-    } elseif($alignItem->hasClass('alignleft')) {
+    } elseif ($alignItem->hasClass('alignleft')) {
       $align = 'left';
-    } elseif($alignItem->hasClass('alignright')) {
+    } elseif ($alignItem->hasClass('alignright')) {
       $align = 'right';
     } else {
       $align = 'left';
diff --git a/lib/Router/Endpoints/ViewInBrowser.php b/lib/Router/Endpoints/ViewInBrowser.php
index 24939a37fd..2581c35f10 100644
--- a/lib/Router/Endpoints/ViewInBrowser.php
+++ b/lib/Router/Endpoints/ViewInBrowser.php
@@ -59,7 +59,7 @@ class ViewInBrowser {
       if(empty($data->subscriber_token) ||
          !Subscriber::verifyToken($data->subscriber->email, $data->subscriber_token)
       ) return false;
-    } else if(!$data->subscriber && !empty($data->preview)) {
+    } else if (!$data->subscriber && !empty($data->preview)) {
       // if this is a preview and subscriber does not exist,
       // attempt to set subscriber to the current logged-in WP user
       $data->subscriber = Subscriber::getCurrentWPUser();
diff --git a/lib/Segments/SubscribersFinder.php b/lib/Segments/SubscribersFinder.php
index f2a5fe02b4..bc1c666392 100644
--- a/lib/Segments/SubscribersFinder.php
+++ b/lib/Segments/SubscribersFinder.php
@@ -134,7 +134,7 @@ class SubscribersFinder {
     foreach ($subscribers as $subscriber) {
       if(is_a($subscriber, 'MailPoet\Models\Model')) {
         $result[$subscriber->id] = $subscriber;
-      } elseif(is_scalar($subscriber)) {
+      } elseif (is_scalar($subscriber)) {
         $result[$subscriber] = $subscriber;
       } else {
         $result[$subscriber['id']] = $subscriber;
diff --git a/lib/Subscribers/ImportExport/Import/MailChimp.php b/lib/Subscribers/ImportExport/Import/MailChimp.php
index e41ac0f75d..1b4e4de0b1 100644
--- a/lib/Subscribers/ImportExport/Import/MailChimp.php
+++ b/lib/Subscribers/ImportExport/Import/MailChimp.php
@@ -86,7 +86,7 @@ class MailChimp {
             }
             if(!isset($header_hash)) {
               $header_hash = md5(implode(',', $header));
-            } elseif(md5(implode(',', $header) !== $header_hash)) {
+            } elseif (md5(implode(',', $header) !== $header_hash)) {
               return $this->throwException('headers');
             }
           } else {
diff --git a/lib/Subscription/Comment.php b/lib/Subscription/Comment.php
index 6563c664de..9d6f421867 100644
--- a/lib/Subscription/Comment.php
+++ b/lib/Subscription/Comment.php
@@ -52,7 +52,7 @@ class Comment {
           'subscribe_on_comment',
           true
         );
-      } else if($comment_status === Comment::APPROVED) {
+      } else if ($comment_status === Comment::APPROVED) {
         static::subscribeAuthorOfComment($comment_id);
       }
     }
diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php
index 8b16beaabe..4dd4eaefad 100644
--- a/lib/Subscription/Pages.php
+++ b/lib/Subscription/Pages.php
@@ -241,7 +241,7 @@ class Pages {
         'first_name' => 'John',
         'last_name' => 'Doe'
       ));
-    } else if($this->subscriber !== false) {
+    } else if ($this->subscriber !== false) {
       $subscriber = $this->subscriber
       ->withCustomFields()
       ->withSubscriptions();
diff --git a/lib/Tasks/Sending.php b/lib/Tasks/Sending.php
index a1a949cedf..a087da19a7 100644
--- a/lib/Tasks/Sending.php
+++ b/lib/Tasks/Sending.php
@@ -208,7 +208,7 @@ class Sending {
     if($this->isCommonProperty($prop)) {
       $this->queue->$prop = $value;
       $this->task->$prop = $value;
-    } elseif($this->isQueueProperty($prop)) {
+    } elseif ($this->isQueueProperty($prop)) {
       $this->queue->$prop = $value;
     } else {
       $this->task->$prop = $value;
diff --git a/lib/Tasks/Subscribers/BatchIterator.php b/lib/Tasks/Subscribers/BatchIterator.php
index ced2a15fb5..5aa8e49a4e 100644
--- a/lib/Tasks/Subscribers/BatchIterator.php
+++ b/lib/Tasks/Subscribers/BatchIterator.php
@@ -15,7 +15,7 @@ class BatchIterator implements \Iterator, \Countable {
   function __construct($task_id, $batch_size) {
     if($task_id <= 0) {
       throw new \Exception('Task ID must be greater than zero');
-    } elseif($batch_size <= 0) {
+    } elseif ($batch_size <= 0) {
       throw new \Exception('Batch size must be greater than zero');
     }
     $this->task_id = (int)$task_id;
diff --git a/lib/Twig/I18n.php b/lib/Twig/I18n.php
index da3e4ecfd5..193f57f84d 100644
--- a/lib/Twig/I18n.php
+++ b/lib/Twig/I18n.php
@@ -85,7 +85,7 @@ class I18n extends \Twig_Extension {
     // check if it's an int passed as a string
     if((string)(int)$date === $date) {
       $date = (int)$date;
-    } else if(!is_int($date)) {
+    } else if (!is_int($date)) {
       $date = strtotime($date);
     }
 
diff --git a/lib/Util/ArrayColumn.php b/lib/Util/ArrayColumn.php
index 0b02649e9b..aa0f393bdc 100644
--- a/lib/Util/ArrayColumn.php
+++ b/lib/Util/ArrayColumn.php
@@ -64,7 +64,7 @@ function array_column($input = null, $column_key = null, $index_key = null) {
     if($params_column_key === null) {
       $value_set = true;
       $value = $row;
-    } elseif(is_array($row) && array_key_exists($params_column_key, $row)) {
+    } elseif (is_array($row) && array_key_exists($params_column_key, $row)) {
       $value_set = true;
       $value = $row[$params_column_key];
     }
diff --git a/lib/Util/CSS.php b/lib/Util/CSS.php
index a1b8e6ecb1..dd1a90a38b 100644
--- a/lib/Util/CSS.php
+++ b/lib/Util/CSS.php
@@ -149,7 +149,7 @@ class CSS {
     usort($rules, function($a, $b) {
       if($a['specificity'] > $b['specificity']) {
         return -1;
-      } else if($a['specificity'] < $b['specificity']) {
+      } else if ($a['specificity'] < $b['specificity']) {
         return 1;
       } else {
         if($a['position'] > $b['position']) {
@@ -195,7 +195,7 @@ class CSS {
           // if the character is an opening bracket, push it onto the stack, otherwise pop the stack
           if($css[$i] == "{") {
             array_push($s, "{");
-          } else if($css[$i] == "}") {
+          } else if ($css[$i] == "}") {
             array_pop($s);
           }
 
@@ -238,7 +238,7 @@ class CSS {
       if(strstr($chunk, '#') !== false) $specifity += 100;
 
           // classes are more important than a tag, but less important then an ID
-      elseif(strstr($chunk, '.')) $specifity += 10;
+      elseif (strstr($chunk, '.')) $specifity += 10;
 
           // anything else isn't that important
       else $specifity += 1;
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index 14f3275db4..d45f66ca85 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -71,9 +71,9 @@ class AcceptanceTester extends \Codeception\Actor {
     $I = $this;
     if($page === 'Emails') {
       $path = 'newsletters';
-    } elseif($page === 'Lists') {
+    } elseif ($page === 'Lists') {
       $path = 'segments';
-    } elseif($page === 'Segments') {
+    } elseif ($page === 'Segments') {
       $path = 'dynamic-segments';
     } else {
       $path = strtolower($page);
diff --git a/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php b/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php
index 98bd026bfd..a0ddcbc23b 100644
--- a/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php
+++ b/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php
@@ -93,7 +93,7 @@ class DynamicSubscribersGetterTest extends \MailPoetTest {
       function($segment_id) {
         if($segment_id == 1) {
           return array(new \DynamicSegmentFilter([1, 2]));
-        } else if($segment_id == 2) {
+        } else if ($segment_id == 2) {
           return array(new \DynamicSegmentFilter([1, 3, 4]));
         }
         return array();