diff --git a/lib/Config/Localizer.php b/lib/Config/Localizer.php
index 281dcb18bf..2ae3a75ea0 100644
--- a/lib/Config/Localizer.php
+++ b/lib/Config/Localizer.php
@@ -37,7 +37,7 @@ class Localizer {
       Env::$plugin_name,
       false,
       dirname(plugin_basename(Env::$file)) . '/lang/'
-   );
+    );
   }
 
   function setGlobalRtl() {
diff --git a/lib/Config/Widget.php b/lib/Config/Widget.php
index a0ae7e8666..1f363abd69 100644
--- a/lib/Config/Widget.php
+++ b/lib/Config/Widget.php
@@ -87,7 +87,7 @@ class Widget {
   function setupDependencies() {
     wp_enqueue_style('mailpoet_public', Env::$assets_url.'/css/public.css');
 
-     wp_enqueue_script('mailpoet_vendor',
+    wp_enqueue_script('mailpoet_vendor',
       Env::$assets_url.'/js/vendor.js',
       array(),
       Env::$version,
@@ -157,4 +157,4 @@ class Widget {
       'mailpoet_form_subscribe'
     );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/Cron/BootStrapMenu.php b/lib/Cron/BootStrapMenu.php
index c6410934a6..6842c2c58b 100644
--- a/lib/Cron/BootStrapMenu.php
+++ b/lib/Cron/BootStrapMenu.php
@@ -14,23 +14,19 @@ class BootStrapMenu {
     return ($this->daemon) ?
       array_merge(
         array(
-          'timeSinceStart' =>
-            Carbon::createFromFormat(
-              'Y-m-d H:i:s',
-              $this->daemon->created_at,
-              'UTC'
-            )
-              ->diffForHumans(),
-          'timeSinceUpdate' =>
-            Carbon::createFromFormat(
-              'Y-m-d H:i:s',
-              $this->daemon->updated_at,
-              'UTC'
-            )
-              ->diffForHumans()
+          'timeSinceStart' => Carbon::createFromFormat(
+            'Y-m-d H:i:s',
+            $this->daemon->created_at,
+            'UTC'
+          )->diffForHumans(),
+          'timeSinceUpdate' => Carbon::createFromFormat(
+            'Y-m-d H:i:s',
+            $this->daemon->updated_at,
+            'UTC'
+          )->diffForHumans()
         ),
         json_decode($this->daemon->value, true)
       ) :
       "false";
   }
-}
\ No newline at end of file
+}
diff --git a/lib/Form/Renderer.php b/lib/Form/Renderer.php
index afa67bc01d..71b73ff439 100644
--- a/lib/Form/Renderer.php
+++ b/lib/Form/Renderer.php
@@ -53,43 +53,43 @@ class Renderer {
     switch($block['type']) {
       case 'html':
         $html .= Block\Html::render($block);
-      break;
+        break;
 
       case 'divider':
         $html .= Block\Divider::render();
-      break;
+        break;
 
       case 'checkbox':
         $html .= Block\Checkbox::render($block);
-      break;
+        break;
 
       case 'radio':
         $html .= Block\Radio::render($block);
-      break;
+        break;
 
       case 'segment':
         $html .= Block\Segment::render($block);
-      break;
+        break;
 
       case 'date':
         $html .= Block\Date::render($block);
-      break;
+        break;
 
       case 'select':
         $html .= Block\Select::render($block);
-      break;
+        break;
 
       case 'text':
         $html .= Block\Text::render($block);
-      break;
+        break;
 
       case 'textarea':
         $html .= Block\Textarea::render($block);
-      break;
+        break;
 
       case 'submit':
         $html .= Block\Submit::render($block);
-      break;
+        break;
     }
     return $html;
   }
diff --git a/lib/Models/Model.php b/lib/Models/Model.php
index b00a0dc3f2..c85c2b65f7 100644
--- a/lib/Models/Model.php
+++ b/lib/Models/Model.php
@@ -55,7 +55,7 @@ class Model extends \Sudzy\ValidModel {
           } else {
             $this->setError($e->getMessage());
           }
-        break;
+          break;
         default:
           $this->setError($e->getMessage());
       }
@@ -94,7 +94,7 @@ class Model extends \Sudzy\ValidModel {
   static function bulkRestore($orm) {
     $model = get_called_class();
     return self::bulkAction($orm, function($ids) use($model) {
-       self::rawExecute(join(' ', array(
+      self::rawExecute(join(' ', array(
           'UPDATE `'.$model::$_table.'`',
           'SET `deleted_at` = NULL',
           'WHERE `id` IN ('.rtrim(str_repeat('?,', count($ids)), ',').')'
diff --git a/lib/Models/Newsletter.php b/lib/Models/Newsletter.php
index aae33edaa6..03f05f298c 100644
--- a/lib/Models/Newsletter.php
+++ b/lib/Models/Newsletter.php
@@ -287,12 +287,20 @@ class Newsletter extends Model {
     $orm = $orm
       ->left_outer_join(
         MP_NEWSLETTER_OPTION_TABLE,
-        array(MP_NEWSLETTERS_TABLE.'.id', '=',
-          MP_NEWSLETTER_OPTION_TABLE.'.newsletter_id'))
+        array(
+          MP_NEWSLETTERS_TABLE.'.id',
+          '=',
+          MP_NEWSLETTER_OPTION_TABLE.'.newsletter_id'
+        )
+      )
       ->left_outer_join(
         MP_NEWSLETTER_OPTION_FIELDS_TABLE,
-        array(MP_NEWSLETTER_OPTION_FIELDS_TABLE.'.id','=',
-          MP_NEWSLETTER_OPTION_TABLE.'.option_field_id'))
+        array(
+          MP_NEWSLETTER_OPTION_FIELDS_TABLE.'.id',
+          '=',
+          MP_NEWSLETTER_OPTION_TABLE.'.option_field_id'
+        )
+      )
       ->group_by(MP_NEWSLETTERS_TABLE.'.id');
     return $orm;
   }
@@ -346,7 +354,7 @@ class Newsletter extends Model {
               ->count()
           )
         ));
-      break;
+        break;
 
       case self::TYPE_WELCOME:
       case self::TYPE_NOTIFICATION:
@@ -368,7 +376,7 @@ class Newsletter extends Model {
               ->count()
           )
         ));
-      break;
+        break;
     }
 
     $groups[] = array(
@@ -394,11 +402,11 @@ class Newsletter extends Model {
         $orm
           ->whereNull('deleted_at')
           ->filter('filterStatus', $group);
-      break;
+        break;
 
       case 'trash':
         $orm->whereNotNull('deleted_at');
-      break;
+        break;
 
       default:
         $orm->whereNull('deleted_at');
diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php
index abfe26106a..99bb80962a 100644
--- a/lib/Models/Subscriber.php
+++ b/lib/Models/Subscriber.php
@@ -322,12 +322,20 @@ class Subscriber extends Model {
     $orm = $orm
       ->leftOuterJoin(
         MP_SUBSCRIBER_CUSTOM_FIELD_TABLE,
-        array(MP_SUBSCRIBERS_TABLE.'.id', '=',
-          MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.subscriber_id'))
+        array(
+          MP_SUBSCRIBERS_TABLE.'.id',
+          '=',
+          MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.subscriber_id'
+        )
+      )
       ->leftOuterJoin(
         MP_CUSTOM_FIELDS_TABLE,
-        array(MP_CUSTOM_FIELDS_TABLE.'.id','=',
-          MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.custom_field_id'))
+        array(
+          MP_CUSTOM_FIELDS_TABLE.'.id',
+          '=',
+          MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.custom_field_id'
+        )
+      )
       ->groupBy(MP_SUBSCRIBERS_TABLE.'.id');
     return $orm;
   }
@@ -345,12 +353,18 @@ class Subscriber extends Model {
     $orm = $orm
       ->leftOuterJoin(
         MP_SUBSCRIBER_CUSTOM_FIELD_TABLE,
-        array(MP_SUBSCRIBERS_TABLE.'.id', '=',
-          MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.subscriber_id'))
+        array(
+          MP_SUBSCRIBERS_TABLE.'.id', '=',
+          MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.subscriber_id'
+        )
+      )
       ->leftOuterJoin(
         MP_CUSTOM_FIELDS_TABLE,
-        array(MP_CUSTOM_FIELDS_TABLE.'.id','=',
-          MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.custom_field_id'));
+        array(
+          MP_CUSTOM_FIELDS_TABLE.'.id','=',
+          MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.custom_field_id'
+        )
+      );
     return $orm;
   }
 
@@ -532,7 +546,8 @@ class Subscriber extends Model {
         SubscriberSegment::subscribeManyToSegments(
           $subscriber_ids, array($segment->id)
         );
-    });
+      }
+    );
 
     return array(
       'subscribers' => $subscribers_count,
@@ -653,8 +668,9 @@ class Subscriber extends Model {
         str_repeat(
           '(' . rtrim(str_repeat('?,', count($columns)), ',') . ')' . ', '
           , count($values)
-        )
-        , ', '),
+        ),
+        ', '
+      ),
       Helpers::flattenArray($values)
     );
   }
diff --git a/lib/Newsletter/Renderer/Renderer.php b/lib/Newsletter/Renderer/Renderer.php
index 66d4954612..09c7e69542 100644
--- a/lib/Newsletter/Renderer/Renderer.php
+++ b/lib/Newsletter/Renderer/Renderer.php
@@ -61,16 +61,16 @@ class Renderer {
       switch($selector) {
         case 'text':
           $selector = 'td.mailpoet_paragraph, td.mailpoet_blockquote, li.mailpoet_paragraph';
-        break;
+          break;
         case 'body':
           $selector = 'body, .mailpoet-wrapper';
-        break;
+          break;
         case 'link':
           $selector = '.mailpoet-wrapper a';
-        break;
+          break;
         case 'wrapper':
           $selector = '.mailpoet_content-wrapper';
-        break;
+          break;
       }
       $css .= StylesHelper::setStyle($style, $selector);
     }
@@ -108,4 +108,4 @@ class Renderer {
     );
     return $template;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/Newsletter/Shortcodes/Categories/Link.php b/lib/Newsletter/Shortcodes/Categories/Link.php
index ef21aedfb9..c1fb7331d8 100644
--- a/lib/Newsletter/Shortcodes/Categories/Link.php
+++ b/lib/Newsletter/Shortcodes/Categories/Link.php
@@ -99,13 +99,13 @@ class Link {
           $unsubscribe->track($newsletter['id'], $subscriber['id'], $queue['id']);
         }
         $url = SubscriptionUrl::getUnsubscribeUrl($subscriber);
-      break;
+        break;
       case 'subscription_manage_url':
         $url = SubscriptionUrl::getManageUrl($subscriber);
-      break;
+        break;
       case 'newsletter_view_in_browser_url':
         $url = NewsletterUrl::getViewInBrowserUrl($newsletter, $subscriber, $queue);
-      break;
+        break;
       default:
         $shortcode = self::getShortcode($shortcode_action);
         $url = apply_filters(
@@ -116,7 +116,7 @@ class Link {
           $queue
         );
         $url = ($url !== $shortcode_action) ? $url : false;
-      break;
+        break;
     }
     return $url;
   }
diff --git a/lib/Router/Subscribers.php b/lib/Router/Subscribers.php
index 99c09f87f2..5c33dc0551 100644
--- a/lib/Router/Subscribers.php
+++ b/lib/Router/Subscribers.php
@@ -124,7 +124,7 @@ class Subscribers {
               Url::redirectTo($success_page_url);
             }
           }
-        break;
+          break;
 
         case 'message':
         default:
@@ -143,7 +143,7 @@ class Subscribers {
 
             Url::redirectBack($params);
           }
-        break;
+          break;
       }
     }
   }
diff --git a/lib/Subscribers/ImportExport/Export/Export.php b/lib/Subscribers/ImportExport/Export/Export.php
index 681b8ee542..9979aff052 100644
--- a/lib/Subscribers/ImportExport/Export/Export.php
+++ b/lib/Subscribers/ImportExport/Export/Export.php
@@ -179,23 +179,25 @@ class Export {
 
   function getSubscribers($offset, $limit) {
     // JOIN subscribers on segment and subscriber_segment tables
-    $subscribers = Subscriber::
-    left_outer_join(
+    $subscribers = Subscriber::left_outer_join(
       SubscriberSegment::$_table,
       array(
         Subscriber::$_table . '.id',
         '=',
         SubscriberSegment::$_table . '.subscriber_id'
-      ))
+      )
+    )
       ->left_outer_join(
         Segment::$_table,
         array(
           Segment::$_table . '.id',
           '=',
           SubscriberSegment::$_table . '.segment_id'
-        ))
+        )
+      )
       ->filter('filterWithCustomFieldsForExport')
       ->groupBy(Subscriber::$_table . '.id');
+
     if($this->subscribers_without_segment !== false) {
       // if there are subscribers who do not belong to any segment, use
       // a CASE function to group them under "Not In Segment"
@@ -276,4 +278,4 @@ class Export {
       return $subscriber[$field];
     }, $this->subscriber_fields);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/Subscribers/ImportExport/Import/Import.php b/lib/Subscribers/ImportExport/Import/Import.php
index 631258beff..ba77aa0749 100644
--- a/lib/Subscribers/ImportExport/Import/Import.php
+++ b/lib/Subscribers/ImportExport/Import/Import.php
@@ -293,11 +293,10 @@ class Import {
         );
       }
     }
-    $query = Subscriber::selectMany(
-      array(
-        'id',
-        'email'
-      ));
+    $query = Subscriber::selectMany(array(
+      'id',
+      'email'
+    ));
     $query = ($action === 'update') ?
       $query->where('updated_at', $this->updated_at) :
       $query->where('created_at', $this->created_at);
@@ -373,4 +372,4 @@ class Import {
     $profiler_end = microtime(true);
     return ($profiler_end - $this->profiler_start) / 60;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php
index 2327221b0a..ebe2aebef8 100644
--- a/lib/Subscription/Pages.php
+++ b/lib/Subscription/Pages.php
@@ -114,13 +114,13 @@ class Pages {
     switch($this->action) {
       case 'confirm':
         $content = $this->getConfirmContent();
-      break;
+        break;
       case 'manage':
         $content = $this->getManageContent();
-      break;
+        break;
       case 'unsubscribe':
         $content = $this->getUnsubscribeContent();
-      break;
+        break;
     }
 
     if(strpos($page_content, '[mailpoet_page]') !== false) {
diff --git a/lib/Twig/Handlebars.php b/lib/Twig/Handlebars.php
index 9bb70b10ff..426aaf6ad8 100644
--- a/lib/Twig/Handlebars.php
+++ b/lib/Twig/Handlebars.php
@@ -34,10 +34,10 @@ class Handlebars extends \Twig_Extension {
     switch($args_count) {
       case 2:
         list($id, $file) = $args;
-      break;
+        break;
       case 3:
         list($id, $file, $alias) = $args;
-      break;
+        break;
       default:
         return;
     }