diff --git a/assets/js/src/cron.jsx b/assets/js/src/cron.jsx
index 435a66ab11..6aeef12929 100644
--- a/assets/js/src/cron.jsx
+++ b/assets/js/src/cron.jsx
@@ -37,7 +37,7 @@ define(
       }
     },
     controlCron: function(action) {
-      if (jQuery('.button-primary').hasClass('disabled')) {
+      if(jQuery('.button-primary').hasClass('disabled')) {
         return;
       }
       jQuery('.button-primary')
diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php
index df7bbdee4f..fa76e72e19 100644
--- a/lib/Config/Initializer.php
+++ b/lib/Config/Initializer.php
@@ -142,7 +142,7 @@ class Initializer {
   }
 
   function runQueueSupervisor() {
-    if (php_sapi_name() === 'cli') return;
+    if(php_sapi_name() === 'cli') return;
     try {
       $supervisor = new Supervisor();
       $supervisor->checkDaemon();
diff --git a/lib/Config/PublicAPI.php b/lib/Config/PublicAPI.php
index 39ea81e906..5ef8e206ad 100644
--- a/lib/Config/PublicAPI.php
+++ b/lib/Config/PublicAPI.php
@@ -7,6 +7,11 @@ use MailPoet\Util\Helpers;
 if(!defined('ABSPATH')) exit;
 
 class PublicAPI {
+  public $api;
+  public $section;
+  public $action;
+  public $request_payload;
+
   function __construct() {
     # http://example.com/?mailpoet-api&section=&action=&request_payload=
     $this->api = isset($_GET['mailpoet-api']) ? true : false;
@@ -14,7 +19,7 @@ class PublicAPI {
     $this->action = isset($_GET['action']) ?
       Helpers::underscoreToCamelCase($_GET['action']) :
       false;
-    $this->requestPayload = isset($_GET['request_payload']) ?
+    $this->request_payload = isset($_GET['request_payload']) ?
       json_decode(urldecode($_GET['request_payload']), true) :
       false;
   }
@@ -26,7 +31,7 @@ class PublicAPI {
 
   function queue() {
     try {
-      $queue = new Daemon($this->requestPayload);
+      $queue = new Daemon($this->request_payload);
       $this->_checkAndCallMethod($queue, $this->action);
     } catch(\Exception $e) {
     }
diff --git a/lib/Cron/Daemon.php b/lib/Cron/Daemon.php
index e5309e0d9e..a9e38e5cc8 100644
--- a/lib/Cron/Daemon.php
+++ b/lib/Cron/Daemon.php
@@ -10,91 +10,93 @@ require_once(ABSPATH . 'wp-includes/pluggable.php');
 if(!defined('ABSPATH')) exit;
 
 class Daemon {
-  function __construct($requestPayload = array()) {
+  public $daemon;
+  public $request_payload;
+  public $refreshed_token;
+  public $timer;
+
+  function __construct($request_payload = array()) {
     set_time_limit(0);
     ignore_user_abort();
-    list ($this->daemon, $this->daemonData) = $this->getDaemon();
-    $this->refreshedToken = $this->refreshToken();
-    $this->requestPayload = $requestPayload;
+    $this->daemon = $this->getDaemon();
+    $this->refreshed_token = $this->refreshToken();
+    $this->request_payload = $request_payload;
     $this->timer = microtime(true);
   }
 
   function start() {
-    if(!isset($this->requestPayload['session'])) {
+    if(!isset($this->request_payload['session'])) {
       $this->abortWithError(__('Missing session ID.'));
     }
     $this->manageSession('start');
     $daemon = $this->daemon;
-    $daemonData = $this->daemonData;
     if(!$daemon) {
-      $daemon = Setting::create();
-      $daemon->name = 'cron_daemon';
-      $daemonData = array(
-        'status' => 'starting',
-        'counter' => 0
+      $this->saveDaemon(
+        array(
+          'status' => 'starting',
+          'counter' => 0
+        )
       );
-      $daemon->value = json_encode($daemonData);
-      $daemon->save();
     }
-    if($daemonData['status'] === 'started') {
+    if($daemon['status'] === 'started') {
       $_SESSION['cron_daemon'] = array(
         'result' => false,
         'errors' => array(__('Daemon already running.'))
       );
     }
-    if($daemonData['status'] === 'starting') {
+    if($daemon['status'] === 'starting') {
       $_SESSION['cron_daemon'] = 'started';
       $_SESSION['cron_daemon'] = array('result' => true);
-      $daemonData['status'] = 'started';
-      $daemonData['token'] = $this->refreshedToken;
       $this->manageSession('end');
-      $daemon->value = json_encode($daemonData);
-      $daemon->save();
+      $daemon['status'] = 'started';
+      $daemon['token'] = $this->refreshed_token;
+      $this->saveDaemon($daemon);
       $this->callSelf();
     }
     $this->manageSession('end');
   }
 
   function run() {
-    $allowedStatuses = array(
+    $allowed_statuses = array(
       'stopping',
       'starting',
       'started'
     );
-    if(!$this->daemon || !in_array($this->daemonData['status'], $allowedStatuses)) {
+    if(!$this->daemon || !in_array($this->daemon['status'], $allowed_statuses)) {
       $this->abortWithError(__('Invalid daemon status.'));
     }
-    if(!isset($this->requestPayload['token']) ||
-      $this->requestPayload['token'] !== $this->daemonData['token']
+    if(!isset($this->request_payload['token']) ||
+      $this->request_payload['token'] !== $this->daemon['token']
     ) {
       $this->abortWithError('Invalid token.');
     }
     try {
-      $sendingQueue = new SendingQueue($this->timer);
-      $sendingQueue->process();
+      $sending_queue = new SendingQueue($this->timer);
+      $sending_queue->process();
     } catch(Exception $e) {
     }
-    $elapsedTime = microtime(true) - $this->timer;
-    if($elapsedTime < 30) {
-      sleep(30 - $elapsedTime);
+    $elapsed_time = microtime(true) - $this->timer;
+    if($elapsed_time < 30) {
+      sleep(30 - $elapsed_time);
     }
     // after each execution, read daemon in case it's status was modified
-    list($daemon, $daemonData) = $this->getDaemon();
-    if($daemonData['status'] === 'stopping') $daemonData['status'] = 'stopped';
-    if($daemonData['status'] === 'starting') $daemonData['status'] = 'started';
-    $daemonData['token'] = $this->refreshedToken;
-    $daemonData['counter']++;
-    $daemon->value = json_encode($daemonData);
-    $daemon->save();
-    if($daemonData['status'] === 'started') $this->callSelf();
+    $daemon = $this->getDaemon();
+    if($daemon['status'] === 'stopping') $daemon['status'] = 'stopped';
+    if($daemon['status'] === 'starting') $daemon['status'] = 'started';
+    $daemon['token'] = $this->refreshed_token;
+    $daemon['counter']++;
+    $this->saveDaemon($daemon);
+    if($daemon['status'] === 'started') $this->callSelf();
   }
 
   function getDaemon() {
-    $daemon = Setting::where('name', 'cron_daemon')
-      ->findOne();
-    return array(
-      ($daemon) ? $daemon : null,
-      ($daemon) ? json_decode($daemon->value, true) : null
+    return Setting::getValue('cron_daemon', null);
+  }
+
+  function saveDaemon($daemon_data) {
+    return Setting::setValue(
+      'cron_daemon',
+      $daemon_data
     );
   }
 
@@ -108,7 +110,7 @@ class Daemon {
       if(session_id()) {
         session_write_close();
       }
-      session_id($this->requestPayload['session']);
+      session_id($this->request_payload['session']);
       session_start();
     break;
     case 'end':
@@ -118,7 +120,7 @@ class Daemon {
   }
 
   function callSelf() {
-    $payload = json_encode(array('token' => $this->refreshedToken));
+    $payload = json_encode(array('token' => $this->refreshed_token));
     Supervisor::accessRemoteUrl(
       '/?mailpoet-api&section=queue&action=run&request_payload=' . urlencode($payload)
     );
diff --git a/lib/Cron/Supervisor.php b/lib/Cron/Supervisor.php
index e852ff627b..823f1ccab3 100644
--- a/lib/Cron/Supervisor.php
+++ b/lib/Cron/Supervisor.php
@@ -8,38 +8,39 @@ use MailPoet\Models\Setting;
 if(!defined('ABSPATH')) exit;
 
 class Supervisor {
-  function __construct($forceStart = false) {
-    $this->forceStart = $forceStart;
+  public $daemon;
+
+  function __construct($force_start = false) {
+    $this->force_start = $force_start;
     if(!Env::isPluginActivated()) {
       throw new \Exception(__('MailPoet is not activated.'));
     }
-    list ($this->daemon, $this->daemonData) = $this->getDaemon();
+    $this->daemon = $this->getDaemon();
   }
 
   function checkDaemon() {
     if(!$this->daemon) {
       return $this->startDaemon();
     }
-    if(!$this->forceStart && (
-        $this->daemonData['status'] === 'stopped' ||
-        $this->daemonData['status'] === 'stopping')
+    if(!$this->force_start && (
+        $this->daemon['value']['status'] === 'stopped' ||
+        $this->daemon['value']['status'] === 'stopping')
     ) {
-      return $this->daemonData['status'];
+      return $this->daemon['value']['status'];
     }
-    $timeSinceLastRun = $this->getDaemonLastRunTime();
-    if($timeSinceLastRun < 40) {
-      if(!$this->forceStart) {
+    $time_since_last_run = $this->getDaemonLastRunTime();
+    if($time_since_last_run < 40) {
+      if(!$this->force_start) {
         return;
       }
-      if($this->daemonData['status'] === 'stopping' ||
-        $this->daemonData['status'] === 'starting'
+      if($this->daemon['value']['status'] === 'stopping' ||
+        $this->daemon['value']['status'] === 'starting'
       ) {
-        return $this->daemonData['status'];
+        return $this->daemon['value']['status'];
       }
     }
-    $this->daemonData['status'] = 'starting';
-    $this->daemon->value = json_encode($this->daemonData);
-    $this->daemon->save();
+    $this->daemon['value']['status'] = 'starting';
+    $this->saveDaemon($this->daemon['value']);
     return $this->startDaemon();
   }
 
@@ -50,7 +51,8 @@ class Supervisor {
     $_SESSION['cron_daemon'] = null;
     $requestPayload = json_encode(array('session' => $sessionId));
     self::accessRemoteUrl(
-      '/?mailpoet-api&section=queue&action=start&request_payload=' . urlencode($requestPayload)
+      '/?mailpoet-api&section=queue&action=start&request_payload=' .
+      urlencode($requestPayload)
     );
     session_start();
     $daemonStatus = $_SESSION['cron_daemon'];
@@ -62,10 +64,16 @@ class Supervisor {
   function getDaemon() {
     $daemon = Setting::where('name', 'cron_daemon')
       ->findOne();
-    $daemonData = ($daemon) ? json_decode($daemon->value, true) : false;
-    return array(
-      $daemon,
-      $daemonData
+    if(!$daemon) return false;
+    $daemon = $daemon->asArray();
+    $daemon['value'] = unserialize($daemon['value']);
+    return $daemon;
+  }
+
+  function saveDaemon($daemon_data) {
+    return Setting::setValue(
+      'cron_daemon',
+      $daemon_data
     );
   }
 
@@ -98,11 +106,11 @@ class Supervisor {
   }
 
   function getDaemonLastRunTime() {
-    $currentTime = Carbon::now('UTC');
-    $lastUpdateTime = Carbon::createFromFormat(
+    $current_time = Carbon::now('UTC');
+    $last_update_time = Carbon::createFromFormat(
       'Y-m-d H:i:s',
-      $this->daemon->updated_at, 'UTC'
+      $this->daemon['updated_at'], 'UTC'
     );
-    return $currentTime->diffInSeconds($lastUpdateTime);
+    return $current_time->diffInSeconds($last_update_time);
   }
 }
\ No newline at end of file
diff --git a/lib/Cron/Workers/SendingQueue.php b/lib/Cron/Workers/SendingQueue.php
index f41fb5aed8..33b2f0a6ea 100644
--- a/lib/Cron/Workers/SendingQueue.php
+++ b/lib/Cron/Workers/SendingQueue.php
@@ -10,36 +10,41 @@ use MailPoet\Newsletter\Renderer\Renderer;
 if(!defined('ABSPATH')) exit;
 
 class SendingQueue {
+  public $timer;
+
   function __construct($timer = false) {
     $this->timer = ($timer) ? $timer : microtime(true);
   }
 
   function process() {
+    // TODO: implement mailer sending frequency limits
     foreach($this->getQueues() as $queue) {
       $newsletter = Newsletter::findOne($queue->newsletter_id)
         ->asArray();
       if(!$newsletter) {
         continue;
       };
-      $newsletter = $this->renderNewsletter($newsletter);
       $mailer = $this->configureMailerForNewsletter($newsletter);
+      $newsletter = $this->renderNewsletter($newsletter);
       $subscribers = json_decode($queue->subscribers, true);
-      $subscribersToProcess = $subscribers['to_process'];
+      $subscribers_to_process = $subscribers['to_process'];
       if(!isset($subscribers['processed'])) $subscribers['processed'] = array();
       if(!isset($subscribers['failed'])) $subscribers['failed'] = array();
-      foreach(array_chunk($subscribersToProcess, 200) as $subscriberIds) {
-        $dbSubscribers = Subscriber::whereIn('id', $subscriberIds)
+      foreach(array_chunk($subscribers_to_process, 200) as $subscriber_ids) {
+        $db_subscribers = Subscriber::whereIn('id', $subscriber_ids)
           ->findArray();
-        foreach($dbSubscribers as $dbSubscriber) {
+        foreach($db_subscribers as $db_subscriber) {
           $this->checkExecutionTimer();
           $result = $this->sendNewsletter(
             $mailer,
             $this->processNewsletter($newsletter),
-            $dbSubscriber);
+            $db_subscriber);
           if($result) {
-            $this->updateStatistics($newsletter['id'], $dbSubscriber['id'], $queue->id);
-            $subscribers['processed'][] = $dbSubscriber['id'];
-          } else $subscribers['failed'][] = $dbSubscriber['id'];
+            $this->updateStatistics($newsletter['id'], $db_subscriber['id'], $queue->id);
+            $subscribers['processed'][] = $db_subscriber['id'];
+          } else {
+            $subscribers['failed'][] = $db_subscriber['id'];
+          }
           $this->updateQueue($queue, $subscribers);
         }
       }
@@ -52,18 +57,18 @@ class SendingQueue {
   }
 
   function sendNewsletter($mailer, $newsletter, $subscriber) {
-    return $mailer->mailerInstance->send(
+    return $mailer->mailer_instance->send(
       $newsletter,
       $mailer->transformSubscriber($subscriber)
     );
   }
 
-  function updateStatistics($newsletterId, $subscriberId, $queueId) {
-    $newsletterStatistics = NewsletterStatistics::create();
-    $newsletterStatistics->subscriber_id = $newsletterId;
-    $newsletterStatistics->newsletter_id = $subscriberId;
-    $newsletterStatistics->queue_id = $queueId;
-    $newsletterStatistics->save();
+  function updateStatistics($newsletter_id, $subscriber_id, $queue_id) {
+    $newsletter_statistic = NewsletterStatistics::create();
+    $newsletter_statistic->subscriber_id = $newsletter_id;
+    $newsletter_statistic->newsletter_id = $subscriber_id;
+    $newsletter_statistic->queue_id = $queue_id;
+    $newsletter_statistic->save();
   }
 
   function updateQueue($queue, $subscribers) {
@@ -93,20 +98,24 @@ class SendingQueue {
         'name' => $newsletter['sender_name'],
         'address' => $newsletter['sender_address']
       );
-    } else $sender = false;
+    } else {
+      $sender = false;
+    }
     if(!empty($newsletter['reply_to_address']) && !empty($newsletter['reply_to_name'])) {
-      $replyTo = array(
+      $reply_to = array(
         'name' => $newsletter['reply_to_name'],
         'address' => $newsletter['reply_to_address']
       );
-    } else $replyTo = false;
-    $mailer = new Mailer($method = false, $sender, $replyTo);
+    } else {
+      $reply_to = false;
+    }
+    $mailer = new Mailer($method = false, $sender, $reply_to);
     return $mailer;
   }
 
   function checkExecutionTimer() {
-    $elapsedTime = microtime(true) - $this->timer;
-    if($elapsedTime >= 30) throw new \Exception('Maximum execution time reached.');
+    $elapsed_time = microtime(true) - $this->timer;
+    if($elapsed_time >= 30) throw new \Exception('Maximum execution time reached.');
   }
 
   function getQueues() {
@@ -118,7 +127,8 @@ class SendingQueue {
 
   function renderNewsletter($newsletter) {
     $renderer = new Renderer(json_decode($newsletter['body'], true));
-    $newsletter['body'] = $renderer->renderAll();
+    // TODO: update once text rendering is implemented/enderer returns an array
+    $newsletter['body'] = array('html' => $renderer->render(), 'text' => '');
     return $newsletter;
   }
 }
\ No newline at end of file
diff --git a/lib/Mailer/Mailer.php b/lib/Mailer/Mailer.php
index 961711a2d8..90da5f68c7 100644
--- a/lib/Mailer/Mailer.php
+++ b/lib/Mailer/Mailer.php
@@ -8,86 +8,91 @@ require_once(ABSPATH . 'wp-includes/pluggable.php');
 if(!defined('ABSPATH')) exit;
 
 class Mailer {
+  public $mailer;
+  public $sender;
+  public $reply_to;
+  public $mailer_instance;
+
   function __construct($mailer = false, $sender = false, $reply_to = false) {
     $this->mailer = $this->getMailer($mailer);
     $this->sender = $this->getSender($sender);
-    $this->replyTo = $this->getReplyTo($reply_to);
-    $this->mailerInstance = $this->buildMailer();
+    $this->reply_to = $this->getReplyTo($reply_to);
+    $this->mailer_instance = $this->buildMailer();
   }
   
   function send($newsletter, $subscriber) {
     $subscriber = $this->transformSubscriber($subscriber);
-    return $this->mailerInstance->send($newsletter, $subscriber);
+    return $this->mailer_instance->send($newsletter, $subscriber);
   }
   
   function buildMailer() {
     switch($this->mailer['method']) {
-      case 'AmazonSES':
-        $mailerInstance = new $this->mailer['class'](
-          $this->mailer['region'],
-          $this->mailer['access_key'],
-          $this->mailer['secret_key'],
-          $this->sender['fromNameEmail']
-        );
-        break;
-      case 'ElasticEmail':
-        $mailerInstance = new $this->mailer['class'](
-          $this->mailer['api_key'],
-          $this->sender['fromEmail'],
-          $this->sender['fromName']
-        );
-        break;
-      case 'MailGun':
-        $mailerInstance = new $this->mailer['class'](
-          $this->mailer['domain'],
-          $this->mailer['api_key'],
-          $this->sender['fromNameEmail']
-        );
-        break;
-      case 'MailPoet':
-        $mailerInstance = new $this->mailer['class'](
-          $this->mailer['mailpoet_api_key'],
-          $this->sender['fromEmail'],
-          $this->sender['fromName']
-        );
-        break;
-      case 'Mandrill':
-        $mailerInstance = new $this->mailer['class'](
-          $this->mailer['api_key'],
-          $this->sender['fromEmail'],
-          $this->sender['fromName']
-        );
-        break;
-      case 'SendGrid':
-        $mailerInstance = new $this->mailer['class'](
-          $this->mailer['api_key'],
-          $this->sender['fromEmail'],
-          $this->sender['fromName']
-        );
-        break;
-      case 'WPMail':
-        $mailerInstance = new $this->mailer['class'](
-          $this->sender['fromEmail'],
-          $this->sender['fromName']
-        );
-        break;
-      case 'SMTP':
-        $mailerInstance = new $this->mailer['class'](
-          $this->mailer['host'],
-          $this->mailer['port'],
-          $this->mailer['authentication'],
-          $this->mailer['login'],
-          $this->mailer['password'],
-          $this->mailer['encryption'],
-          $this->sender['fromEmail'],
-          $this->sender['fromName']
-        );
-        break;
-      default:
-        throw new \Exception(__('Mailing method does not exist.'));
-        break;
+    case 'AmazonSES':
+      $mailer_instance = new $this->mailer['class'](
+        $this->mailer['region'],
+        $this->mailer['access_key'],
+        $this->mailer['secret_key'],
+        $this->sender['from_name_email']
+      );
+    break;
+    case 'ElasticEmail':
+      $mailer_instance = new $this->mailer['class'](
+        $this->mailer['api_key'],
+        $this->sender['from_email'],
+        $this->sender['from_name']
+      );
+    break;
+    case 'MailGun':
+      $mailer_instance = new $this->mailer['class'](
+        $this->mailer['domain'],
+        $this->mailer['api_key'],
+        $this->sender['from_name_email']
+      );
+    break;
+    case 'MailPoet':
+      $mailer_instance = new $this->mailer['class'](
+        $this->mailer['mailpoet_api_key'],
+        $this->sender['from_email'],
+        $this->sender['from_name']
+      );
+    break;
+    case 'Mandrill':
+      $mailer_instance = new $this->mailer['class'](
+        $this->mailer['api_key'],
+        $this->sender['from_email'],
+        $this->sender['from_name']
+      );
+    break;
+    case 'SendGrid':
+      $mailer_instance = new $this->mailer['class'](
+        $this->mailer['api_key'],
+        $this->sender['from_email'],
+        $this->sender['from_name']
+      );
+    break;
+    case 'WPMail':
+      $mailer_instance = new $this->mailer['class'](
+        $this->sender['from_email'],
+        $this->sender['from_name']
+      );
+    break;
+    case 'SMTP':
+      $mailer_instance = new $this->mailer['class'](
+        $this->mailer['host'],
+        $this->mailer['port'],
+        $this->mailer['authentication'],
+        $this->mailer['login'],
+        $this->mailer['password'],
+        $this->mailer['encryption'],
+        $this->sender['from_email'],
+        $this->sender['from_name']
+      );
+    break;
+    default:
+      throw new \Exception(__('Mailing method does not exist.'));
+    break;
     }
-    return $mailerInstance;
+    return $mailer_instance;
   }
   
   function getMailer($mailer = false) {
@@ -105,26 +110,26 @@ class Mailer {
       if(!$sender) throw new \Exception(__('Sender name and email are not configured.'));
     }
     return array(
-      'fromName' => $sender['name'],
-      'fromEmail' => $sender['address'],
-      'fromNameEmail' => sprintf('%s <%s>', $sender['name'], $sender['address'])
+      'from_name' => $sender['name'],
+      'from_email' => $sender['address'],
+      'from_name_email' => sprintf('%s <%s>', $sender['name'], $sender['address'])
     );
   }
 
-  function getReplyTo($replyTo = false) {
-    if(!$replyTo) {
-      $replyTo = Setting::getValue('replyTo', null);
-      if(!$replyTo) {
-        $replyTo = array(
-          'name' => $this->sender['fromName'],
-          'address' => $this->sender['fromEmail']
+  function getReplyTo($reply_to = false) {
+    if(!$reply_to) {
+      $reply_to = Setting::getValue('reply_to', null);
+      if(!$reply_to) {
+        $reply_to = array(
+          'name' => $this->sender['from_name'],
+          'address' => $this->sender['from_email']
         );
       }
     }
     return array(
-      'replyToName' => $replyTo['name'],
-      'replyToEmail' => $replyTo['address'],
-      'replyToNameEmail' => sprintf('%s <%s>', $replyTo['name'], $replyTo['address'])
+      'reply_to_name' => $reply_to['name'],
+      'reply_to_email' => $reply_to['address'],
+      'reply_to_name_email' => sprintf('%s <%s>', $reply_to['name'], $reply_to['address'])
     );
   }
 
diff --git a/lib/Mailer/Methods/AmazonSES.php b/lib/Mailer/Methods/AmazonSES.php
index 4cbd969257..02a7a45d1d 100644
--- a/lib/Mailer/Methods/AmazonSES.php
+++ b/lib/Mailer/Methods/AmazonSES.php
@@ -4,21 +4,34 @@ namespace MailPoet\Mailer\Methods;
 if(!defined('ABSPATH')) exit;
 
 class AmazonSES {
-  function __construct($region, $accessKey, $secretKey, $from) {
-    $this->awsAccessKey = $accessKey;
-    $this->awsSecret_key = $secretKey;
-    $this->awsRegion = $region;
-    $this->awsEndpoint = sprintf('email.%s.amazonaws.com', $region);
-    $this->awsSigningAlgorithm = 'AWS4-HMAC-SHA256';
-    $this->awsService = 'ses';
-    $this->awsTerminationString = 'aws4_request';
-    $this->hashAlgorithm = 'sha256';
-    $this->url = 'https://' . $this->awsEndpoint;
+  public $aws_access_key;
+  public $aws_secret_key;
+  public $aws_region;
+  public $aws_endpoint;
+  public $aws_signing_algorithm;
+  public $aws_service;
+  public $aws_termination_string;
+  public $hash_algorithm;
+  public $url;
+  public $from;
+  public $date;
+  public $date_without_time;
+  
+  function __construct($region, $access_key, $secret_key, $from) {
+    $this->aws_access_key = $access_key;
+    $this->aws_secret_key = $secret_key;
+    $this->aws_region = $region;
+    $this->aws_endpoint = sprintf('email.%s.amazonaws.com', $region);
+    $this->aws_signing_algorithm = 'AWS4-HMAC-SHA256';
+    $this->aws_service = 'ses';
+    $this->aws_termination_string = 'aws4_request';
+    $this->hash_algorithm = 'sha256';
+    $this->url = 'https://' . $this->aws_endpoint;
     $this->from = $from;
     $this->date = gmdate('Ymd\THis\Z');
-    $this->dateWithoutTime = gmdate('Ymd');
+    $this->date_without_time = gmdate('Ymd');
   }
-
+  
   function send($newsletter, $subscriber) {
     $result = wp_remote_post(
       $this->url,
@@ -29,7 +42,7 @@ class AmazonSES {
       wp_remote_retrieve_response_code($result) === 200
     );
   }
-
+  
   function getBody($newsletter, $subscriber) {
     $body = array(
       'Action' => 'SendEmail',
@@ -47,7 +60,7 @@ class AmazonSES {
     }
     return $body;
   }
-
+  
   function request($newsletter, $subscriber) {
     $body = $this->getBody($newsletter, $subscriber);
     return array(
@@ -55,59 +68,88 @@ class AmazonSES {
       'httpversion' => '1.1',
       'method' => 'POST',
       'headers' => array(
-        'Host' => $this->awsEndpoint,
+        'Host' => $this->aws_endpoint,
         'Authorization' => $this->signRequest($body),
         'X-Amz-Date' => $this->date
       ),
       'body' => urldecode(http_build_query($body))
     );
   }
-
+  
   function signRequest($body) {
-    $stringToSign = $this->createStringToSign(
+    $string_to_sign = $this->createStringToSign(
       $this->getCredentialScope(),
       $this->getCanonicalRequest($body)
     );
-    $signature = hash_hmac($this->hashAlgorithm, $stringToSign, $this->getSigningKey());
-
+    $signature = hash_hmac(
+      $this->hash_algorithm,
+      $string_to_sign,
+      $this->getSigningKey()
+    );
+    
     return sprintf(
       '%s Credential=%s/%s, SignedHeaders=host;x-amz-date, Signature=%s',
-      $this->awsSigningAlgorithm,
-      $this->awsAccessKey,
+      $this->aws_signing_algorithm,
+      $this->aws_access_key,
       $this->getCredentialScope(),
       $signature);
   }
-
+  
   function getCredentialScope() {
-    return sprintf('%s/%s/%s/%s', $this->dateWithoutTime, $this->awsRegion, $this->awsService, $this->awsTerminationString);
+    return sprintf(
+      '%s/%s/%s/%s',
+      $this->date_without_time,
+      $this->aws_region,
+      $this->aws_service,
+      $this->aws_termination_string);
   }
-
+  
   function getCanonicalRequest($body) {
     return implode("\n", array(
       'POST',
       '/',
       '',
-      'host:' . $this->awsEndpoint,
+      'host:' . $this->aws_endpoint,
       'x-amz-date:' . $this->date,
       '',
       'host;x-amz-date',
-      hash($this->hashAlgorithm, urldecode(http_build_query($body)))
+      hash($this->hash_algorithm, urldecode(http_build_query($body)))
     ));
   }
-
-  function createStringToSign($credentialScope, $canonicalRequest) {
+  
+  function createStringToSign($credential_scope, $canonical_request) {
     return implode("\n", array(
-      $this->awsSigningAlgorithm,
+      $this->aws_signing_algorithm,
       $this->date,
-      $credentialScope,
-      hash($this->hashAlgorithm, $canonicalRequest)
+      $credential_scope,
+      hash($this->hash_algorithm, $canonical_request)
     ));
   }
-
+  
   function getSigningKey() {
-    $dateKey = hash_hmac($this->hashAlgorithm, $this->dateWithoutTime, 'AWS4' . $this->awsSecret_key, true);
-    $regionKey = hash_hmac($this->hashAlgorithm, $this->awsRegion, $dateKey, true);
-    $serviceKey = hash_hmac($this->hashAlgorithm, $this->awsService, $regionKey, true);
-    return hash_hmac($this->hashAlgorithm, $this->awsTerminationString, $serviceKey, true);
+    $date_key = hash_hmac(
+      $this->hash_algorithm,
+      $this->date_without_time,
+      'AWS4' . $this->aws_secret_key,
+      true
+    );
+    $region_key = hash_hmac(
+      $this->hash_algorithm,
+      $this->aws_region,
+      $date_key,
+      true
+    );
+    $service_key = hash_hmac(
+      $this->hash_algorithm,
+      $this->aws_service,
+      $region_key,
+      true
+    );
+    return hash_hmac(
+      $this->hash_algorithm,
+      $this->aws_termination_string,
+      $service_key,
+      true
+    );
   }
 }
\ No newline at end of file
diff --git a/lib/Mailer/Methods/ElasticEmail.php b/lib/Mailer/Methods/ElasticEmail.php
index b611da10e4..4fcc213d05 100644
--- a/lib/Mailer/Methods/ElasticEmail.php
+++ b/lib/Mailer/Methods/ElasticEmail.php
@@ -4,11 +4,15 @@ namespace MailPoet\Mailer\Methods;
 if(!defined('ABSPATH')) exit;
 
 class ElasticEmail {
-  function __construct($apiKey, $fromEmail, $fromName) {
-    $this->url = 'https://api.elasticemail.com/mailer/send';
-    $this->apiKey = $apiKey;
-    $this->fromEmail = $fromEmail;
-    $this->fromName = $fromName;
+  public $url = 'https://api.elasticemail.com/mailer/send';
+  public $api_key;
+  public $from_email;
+  public $from_name;
+  
+  function __construct($api_key, $from_email, $from_name) {
+    $this->api_key = $api_key;
+    $this->from_email = $from_email;
+    $this->from_name = $from_name;
   }
 
   function send($newsletter, $subscriber) {
@@ -23,9 +27,9 @@ class ElasticEmail {
 
   function getBody($newsletter, $subscriber) {
     $body = array(
-      'api_key' => $this->apiKey,
-      'from' => $this->fromEmail,
-      'from_name' => $this->fromName,
+      'api_key' => $this->api_key,
+      'from' => $this->from_email,
+      'from_name' => $this->from_name,
       'to' => $subscriber,
       'subject' => $newsletter['subject']
     );
diff --git a/lib/Mailer/Methods/MailGun.php b/lib/Mailer/Methods/MailGun.php
index 256871c36e..3916d76ddd 100644
--- a/lib/Mailer/Methods/MailGun.php
+++ b/lib/Mailer/Methods/MailGun.php
@@ -4,9 +4,13 @@ namespace MailPoet\Mailer\Methods;
 if(!defined('ABSPATH')) exit;
 
 class MailGun {
-  function __construct($domain, $apiKey, $from) {
+  public $url;
+  public $api_key;
+  public $from;
+  
+  function __construct($domain, $api_key, $from) {
     $this->url = sprintf('https://api.mailgun.net/v3/%s/messages', $domain);
-    $this->apiKey = $apiKey;
+    $this->api_key = $api_key;
     $this->from = $from;
   }
 
@@ -37,7 +41,7 @@ class MailGun {
   }
 
   function auth() {
-    return 'Basic ' . base64_encode('api:' . $this->apiKey);
+    return 'Basic ' . base64_encode('api:' . $this->api_key);
   }
 
   function request($newsletter, $subscriber) {
diff --git a/lib/Mailer/Methods/MailPoet.php b/lib/Mailer/Methods/MailPoet.php
index 3861b7539a..f1377ffd6a 100644
--- a/lib/Mailer/Methods/MailPoet.php
+++ b/lib/Mailer/Methods/MailPoet.php
@@ -4,13 +4,17 @@ namespace MailPoet\Mailer\Methods;
 if(!defined('ABSPATH')) exit;
 
 class MailPoet {
-  function __construct($apiKey, $fromEmail, $fromName) {
-    $this->url = 'https://bridge.mailpoet.com/api/messages';
-    $this->apiKey = $apiKey;
-    $this->fromEmail = $fromEmail;
-    $this->fromName = $fromName;
+  public $url = 'https://bridge.mailpoet.com/api/messages';
+  public $api_key;
+  public $from_email;
+  public $from_name;
+  
+  function __construct($api_key, $from_email, $from_name) {
+    $this->api_key = $api_key;
+    $this->from_email = $from_email;
+    $this->from_name = $from_name;
   }
-
+  
   function send($newsletter, $subscriber) {
     $result = wp_remote_post(
       $this->url,
@@ -21,20 +25,20 @@ class MailPoet {
       wp_remote_retrieve_response_code($result) === 201
     );
   }
-
+  
   function processSubscriber($subscriber) {
-    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriberData);
-    if(!isset($subscriberData['email'])) {
-      $subscriberData = array(
+    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriber_data);
+    if(!isset($subscriber_data['email'])) {
+      $subscriber_data = array(
         'email' => $subscriber,
       );
     }
     return array(
-      'email' => $subscriberData['email'],
-      'name' => (isset($subscriberData['name'])) ? $subscriberData['name'] : ''
+      'email' => $subscriber_data['email'],
+      'name' => (isset($subscriber_data['name'])) ? $subscriber_data['name'] : ''
     );
   }
-
+  
   function getBody($newsletter, $subscriber) {
     $body = array(
       'to' => (array(
@@ -42,8 +46,8 @@ class MailPoet {
         'name' => $subscriber['name']
       )),
       'from' => (array(
-        'address' => $this->fromEmail,
-        'name' => $this->fromName
+        'address' => $this->from_email,
+        'name' => $this->from_name
       )),
       'subject' => $newsletter['subject']
     );
@@ -55,11 +59,11 @@ class MailPoet {
     }
     return $body;
   }
-
+  
   function auth() {
-    return 'Basic ' . base64_encode('api:' . $this->apiKey);
+    return 'Basic ' . base64_encode('api:' . $this->api_key);
   }
-
+  
   function request($newsletter, $subscriber) {
     $body = array($this->getBody($newsletter, $subscriber));
     return array(
diff --git a/lib/Mailer/Methods/Mandrill.php b/lib/Mailer/Methods/Mandrill.php
index 0d27dcc851..a2b03691b3 100644
--- a/lib/Mailer/Methods/Mandrill.php
+++ b/lib/Mailer/Methods/Mandrill.php
@@ -4,11 +4,15 @@ namespace MailPoet\Mailer\Methods;
 if(!defined('ABSPATH')) exit;
 
 class Mandrill {
-  function __construct($apiKey, $fromEmail, $fromName) {
-    $this->url = 'https://mandrillapp.com/api/1.0/messages/send.json';
-    $this->apiKey = $apiKey;
-    $this->fromName = $fromName;
-    $this->fromEmail = $fromEmail;
+  public $url = 'https://mandrillapp.com/api/1.0/messages/send.json';
+  public $api_key;
+  public $from_email;
+  public $from_name;
+  
+  function __construct($api_key, $from_email, $from_name) {
+    $this->api_key = $api_key;
+    $this->from_name = $from_name;
+    $this->from_email = $from_email;
   }
   
   function send($newsletter, $subscriber) {
@@ -24,24 +28,24 @@ class Mandrill {
   }
   
   function processSubscriber($subscriber) {
-    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriberData);
-    if(!isset($subscriberData['email'])) {
-      $subscriberData = array(
+    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriber_data);
+    if(!isset($subscriber_data['email'])) {
+      $subscriber_data = array(
         'email' => $subscriber,
       );
     }
     return array(
-      'email' => $subscriberData['email'],
-      'name' => (isset($subscriberData['name'])) ? $subscriberData['name'] : ''
+      'email' => $subscriber_data['email'],
+      'name' => (isset($subscriber_data['name'])) ? $subscriber_data['name'] : ''
     );
   }
   
   function getBody($newsletter, $subscriber) {
     $body = array(
-      'key' => $this->apiKey,
+      'key' => $this->api_key,
       'message' => array(
-        'from_email' => $this->fromEmail,
-        'from_name' => $this->fromName,
+        'from_email' => $this->from_email,
+        'from_name' => $this->from_name,
         'to' => array($subscriber),
         'subject' => $newsletter['subject']
       ),
diff --git a/lib/Mailer/Methods/SMTP.php b/lib/Mailer/Methods/SMTP.php
index f5424f7288..0b5b37e853 100644
--- a/lib/Mailer/Methods/SMTP.php
+++ b/lib/Mailer/Methods/SMTP.php
@@ -4,16 +4,27 @@ namespace MailPoet\Mailer\Methods;
 if(!defined('ABSPATH')) exit;
 
 class SMTP {
-  function __construct($host, $port, $authentication, $login = null, $password = null, $encryption,
-    $fromEmail, $fromName) {
+  public $host;
+  public $port;
+  public $authentication;
+  public $login;
+  public $password;
+  public $encryption;
+  public $from_name;
+  public $from_email;
+  public $mailer;
+  
+  function __construct(
+    $host, $port, $authentication, $login = null, $password = null, $encryption,
+    $from_email, $from_name) {
     $this->host = $host;
     $this->port = $port;
     $this->authentication = $authentication;
     $this->login = $login;
     $this->password = $password;
     $this->encryption = $encryption;
-    $this->fromName = $fromName;
-    $this->fromEmail = $fromEmail;
+    $this->from_name = $from_name;
+    $this->from_email = $from_email;
     $this->mailer = $this->buildMailer();
   }
 
@@ -42,7 +53,7 @@ class SMTP {
 
   function createMessage($newsletter, $subscriber) {
     $message = \Swift_Message::newInstance()
-      ->setFrom(array($this->fromEmail => $this->fromName))
+      ->setFrom(array($this->from_email => $this->from_name))
       ->setTo($this->processSubscriber($subscriber))
       ->setSubject($newsletter['subject']);
     if(!empty($newsletter['body']['html'])) {
@@ -55,15 +66,15 @@ class SMTP {
   }
 
   function processSubscriber($subscriber) {
-    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriberData);
-    if(!isset($subscriberData['email'])) {
-      $subscriberData = array(
+    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriber_data);
+    if(!isset($subscriber_data['email'])) {
+      $subscriber_data = array(
         'email' => $subscriber,
       );
     }
     return array(
-      $subscriberData['email'] =>
-        (isset($subscriberData['name'])) ? $subscriberData['name'] : ''
+      $subscriber_data['email'] =>
+        (isset($subscriber_data['name'])) ? $subscriber_data['name'] : ''
     );
   }
 }
\ No newline at end of file
diff --git a/lib/Mailer/Methods/SendGrid.php b/lib/Mailer/Methods/SendGrid.php
index b182ede355..fa1326a8a6 100644
--- a/lib/Mailer/Methods/SendGrid.php
+++ b/lib/Mailer/Methods/SendGrid.php
@@ -4,11 +4,15 @@ namespace MailPoet\Mailer\Methods;
 if(!defined('ABSPATH')) exit;
 
 class SendGrid {
-  function __construct($apiKey, $fromEmail, $fromName) {
-    $this->url = 'https://api.sendgrid.com/api/mail.send.json';
-    $this->apiKey = $apiKey;
-    $this->fromEmail = $fromEmail;
-    $this->fromName = $fromName;
+  public $url = 'https://api.sendgrid.com/api/mail.send.json';
+  public $api_key;
+  public $from_email;
+  public $from_name;
+
+  function __construct($api_key, $from_email, $from_name) {
+    $this->api_key = $api_key;
+    $this->from_email = $from_email;
+    $this->from_name = $from_name;
   }
 
   function send($newsletter, $subscriber) {
@@ -27,8 +31,8 @@ class SendGrid {
   function getBody($newsletter, $subscriber) {
     $body = array(
       'to' => $subscriber,
-      'from' => $this->fromEmail,
-      'fromname' => $this->fromName,
+      'from' => $this->from_email,
+      'from_name' => $this->from_name,
       'subject' => $newsletter['subject']
     );
     if(!empty($newsletter['body']['html'])) {
@@ -41,7 +45,7 @@ class SendGrid {
   }
 
   function auth() {
-    return 'Bearer ' . $this->apiKey;
+    return 'Bearer ' . $this->api_key;
   }
 
   function request($newsletter, $subscriber) {
diff --git a/lib/Mailer/Methods/WPMail.php b/lib/Mailer/Methods/WPMail.php
index 014a8c009b..a2b16c1965 100644
--- a/lib/Mailer/Methods/WPMail.php
+++ b/lib/Mailer/Methods/WPMail.php
@@ -6,18 +6,17 @@ require_once(ABSPATH . 'wp-includes/pluggable.php');
 if(!defined('ABSPATH')) exit;
 
 class WPMail {
-  function __construct($fromEmail, $fromName) {
-    $this->fromEmail = $fromEmail;
-    $this->fromName = $fromName;
-    add_filter('wp_mail_from', array(
-      $this,
-      'setFromEmail'
-    ));
-    $this->filters = array(
-      'wp_mail_from' => 'setFromEmail',
-      'wp_mail_from_name' => 'setFromName',
-      'wp_mail_content_type' => 'setContentType'
-    );
+  public $from_email;
+  public $from_name;
+  public $filters = array(
+    'wp_mail_from' => 'setFromEmail',
+    'wp_mail_from_name' => 'setFromName',
+    'wp_mail_content_type' => 'setContentType'
+  );
+
+  function __construct($from_email, $from_name) {
+    $this->from_email = $from_email;
+    $this->from_name = $from_name;
   }
 
   function addFilters() {
@@ -39,11 +38,11 @@ class WPMail {
   }
 
   function setFromEmail() {
-    return $this->fromEmail;
+    return $this->from_email;
   }
 
   function setFromName() {
-    return $this->fromName;
+    return $this->from_name;
   }
 
   function setContentType() {
@@ -54,7 +53,9 @@ class WPMail {
     $this->addFilters();
     $result = wp_mail(
       $subscriber, $newsletter['subject'],
-      (!empty($newsletter['body']['html'])) ? $newsletter['body']['html'] : $newsletter['body']['text']
+      (!empty($newsletter['body']['html'])) ?
+        $newsletter['body']['html'] :
+        $newsletter['body']['text']
     );
     $this->removeFilters();
     return ($result === true);
diff --git a/lib/Newsletter/Renderer/Renderer.php b/lib/Newsletter/Renderer/Renderer.php
index c7cb08f0dd..e0d9ef3dc1 100644
--- a/lib/Newsletter/Renderer/Renderer.php
+++ b/lib/Newsletter/Renderer/Renderer.php
@@ -15,7 +15,7 @@ class Renderer {
     $this->template = file_get_contents(dirname(__FILE__) . '/' . $this->template);
   }
 
-  function renderAll() {
+  function render() {
     $newsletterContent = $this->renderContent($this->data['content']);
     $newsletterStyles = $this->renderStyles($this->data['globalStyles']);
 
diff --git a/lib/Router/Cron.php b/lib/Router/Cron.php
index 46cc53449e..fbef9a80e9 100644
--- a/lib/Router/Cron.php
+++ b/lib/Router/Cron.php
@@ -1,8 +1,10 @@
 <?php
 namespace MailPoet\Router;
 
+use Carbon\Carbon;
 use MailPoet\Cron\Daemon;
 use MailPoet\Cron\Supervisor;
+use MailPoet\Models\Setting;
 
 if(!defined('ABSPATH')) exit;
 
@@ -19,13 +21,12 @@ class Cron {
   function stop() {
     $daemon = new Daemon();
     if(!$daemon->daemon ||
-      $daemon->daemonData['status'] !== 'started'
+      $daemon->daemon['status'] !== 'started'
     ) {
       $result = false;
     } else {
-      $daemon->daemonData['status'] = 'stopping';
-      $daemon->daemon->value = json_encode($daemon->daemonData);
-      $result = $daemon->daemon->save();
+      $daemon->daemon['status'] = 'stopping';
+      $result = $daemon->saveDaemon($daemon->daemon);
     }
     wp_send_json(
       array(
@@ -35,7 +36,28 @@ class Cron {
   }
 
   function getStatus() {
-    $daemon = new \MailPoet\Cron\BootStrapMenu();
-    wp_send_json($daemon->bootStrap());
+    $daemon = Setting::where('name', 'cron_daemon')
+      ->findOne();
+    wp_send_json(
+      ($daemon) ?
+        array_merge(
+          array(
+            'timeSinceStart' =>
+              Carbon::createFromFormat(
+                'Y-m-d H:i:s',
+                $daemon->created_at,
+                'UTC'
+              )->diffForHumans(),
+            'timeSinceUpdate' =>
+              Carbon::createFromFormat(
+                'Y-m-d H:i:s',
+                $daemon->updated_at,
+                'UTC'
+              )->diffForHumans()
+          ),
+          unserialize($daemon->value)
+        ) :
+        "false"
+    );
   }
 }
\ No newline at end of file
diff --git a/lib/Router/Newsletters.php b/lib/Router/Newsletters.php
index ae37ef2bc4..a07af4c05f 100644
--- a/lib/Router/Newsletters.php
+++ b/lib/Router/Newsletters.php
@@ -188,12 +188,12 @@ class Newsletters {
       ));
     }
 
-    // TO REMOVE once we add the columns from/reply_to
+    // TODO: TO REMOVE once we add the columns from/reply_to
     $newsletter = array_merge($newsletter, $data['newsletter']);
     // END - TO REMOVE
 
     $renderer = new Renderer(json_decode($newsletter['body'], true));
-    $newsletter['body']['html'] = $renderer->renderAll();
+    $newsletter['body']['html'] = $renderer->render();
     $newsletter['body']['text'] = '';
 
     $subscribers = Subscriber::find_array();
@@ -218,7 +218,7 @@ class Newsletters {
       wp_send_json(false);
     }
     $renderer = new Renderer(json_decode($data['body'], true));
-    wp_send_json(array('rendered_body' => $renderer->renderAll()));
+    wp_send_json(array('rendered_body' => $renderer->render()));
   }
 
   function listing($data = array()) {
diff --git a/tests/unit/Mailer/MailerCest.php b/tests/unit/Mailer/MailerCest.php
index ccc94b768f..69d6a13cc4 100644
--- a/tests/unit/Mailer/MailerCest.php
+++ b/tests/unit/Mailer/MailerCest.php
@@ -7,7 +7,7 @@ class MailerCest {
       'name' => 'Sender',
       'address' => 'staff@mailinator.com'
     );
-    $this->replyTo = array(
+    $this->reply_to = array(
       'name' => 'Reply To',
       'address' => 'staff@mailinator.com'
     );
@@ -42,16 +42,16 @@ class MailerCest {
   }
 
   function itCanConstruct() {
-    $mailer = new Mailer($this->mailer, $this->sender, $this->replyTo);
-    expect($mailer->sender['fromName'])->equals($this->sender['name']);
-    expect($mailer->sender['fromEmail'])->equals($this->sender['address']);
-    expect($mailer->replyTo['replyToName'])->equals($this->replyTo['name']);
-    expect($mailer->replyTo['replyToEmail'])->equals($this->replyTo['address']);
+    $mailer = new Mailer($this->mailer, $this->sender, $this->reply_to);
+    expect($mailer->sender['from_name'])->equals($this->sender['name']);
+    expect($mailer->sender['from_email'])->equals($this->sender['address']);
+    expect($mailer->reply_to['reply_to_name'])->equals($this->reply_to['name']);
+    expect($mailer->reply_to['reply_to_email'])->equals($this->reply_to['address']);
   }
 
   function itCanBuildMailerInstance() {
     $mailer = new Mailer($this->mailer, $this->sender);
-    expect(get_class($mailer->mailerInstance))
+    expect(get_class($mailer->mailer_instance))
       ->equals('MailPoet\Mailer\Methods\MailPoet');
   }
 
@@ -64,7 +64,7 @@ class MailerCest {
   }
 
   function itCanTransformSubscriber() {
-    $mailer = new Mailer($this->mailer, $this->sender, $this->replyTo);
+    $mailer = new Mailer($this->mailer, $this->sender, $this->reply_to);
     expect($mailer->transformSubscriber('test@email.com'))
       ->equals('test@email.com');
     expect($mailer->transformSubscriber(
@@ -94,7 +94,7 @@ class MailerCest {
   }
 
   function itCanSend() {
-    $mailer = new Mailer($this->mailer, $this->sender, $this->replyTo);
+    $mailer = new Mailer($this->mailer, $this->sender, $this->reply_to);
     expect($mailer->send($this->newsletter, $this->subscriber))->true();
   }
 }
\ No newline at end of file
diff --git a/tests/unit/Mailer/Methods/AmazonSESCest.php b/tests/unit/Mailer/Methods/AmazonSESCest.php
index 675b32d148..5ea52b2616 100644
--- a/tests/unit/Mailer/Methods/AmazonSESCest.php
+++ b/tests/unit/Mailer/Methods/AmazonSESCest.php
@@ -27,15 +27,16 @@ class AmazonSESCest {
   }
 
   function itsConstructorWorks() {
-    expect($this->mailer->awsEndpoint)
+    expect($this->mailer->aws_endpoint)
       ->equals(
         sprintf('email.%s.amazonaws.com', $this->settings['region'])
       );
-    expect($this->mailer->url)      ->equals(
+    expect($this->mailer->url)
+      ->equals(
       sprintf('https://email.%s.amazonaws.com', $this->settings['region'])
     );
     expect(preg_match('!^\d{8}T\d{6}Z$!', $this->mailer->date))->equals(1);
-    expect(preg_match('!^\d{8}$!', $this->mailer->dateWithoutTime))->equals(1);
+    expect(preg_match('!^\d{8}$!', $this->mailer->date_without_time))->equals(1);
   }
 
   function itCanGenerateBody() {
@@ -60,7 +61,7 @@ class AmazonSESCest {
     expect($request['timeout'])->equals(10);
     expect($request['httpversion'])->equals('1.1');
     expect($request['method'])->equals('POST');
-    expect($request['headers']['Host'])->equals($this->mailer->awsEndpoint);
+    expect($request['headers']['Host'])->equals($this->mailer->aws_endpoint);
     expect($request['headers']['Authorization'])
       ->equals($this->mailer->signRequest($body));
     expect($request['headers']['X-Amz-Date'])->equals($this->mailer->date);
@@ -79,11 +80,11 @@ class AmazonSESCest {
           'POST',
           '/',
           '',
-          'host:' . $this->mailer->awsEndpoint,
+          'host:' . $this->mailer->aws_endpoint,
           'x-amz-date:' . $this->mailer->date,
           '',
           'host;x-amz-date',
-          hash($this->mailer->hashAlgorithm,
+          hash($this->mailer->hash_algorithm,
                urldecode(http_build_query($body))
           )
         )
@@ -94,10 +95,10 @@ class AmazonSESCest {
     $credentialScope = $this->mailer->getCredentialScope();
     expect($credentialScope)
       ->equals(
-        $this->mailer->dateWithoutTime . '/' .
-        $this->mailer->awsRegion . '/' .
-        $this->mailer->awsService . '/' .
-        $this->mailer->awsTerminationString
+        $this->mailer->date_without_time . '/' .
+        $this->mailer->aws_region . '/' .
+        $this->mailer->aws_service . '/' .
+        $this->mailer->aws_termination_string
       );
   }
 
@@ -113,10 +114,10 @@ class AmazonSESCest {
     expect($stringToSing)
       ->equals(
         array(
-          $this->mailer->awsSigningAlgorithm,
+          $this->mailer->aws_signing_algorithm,
           $this->mailer->date,
           $credentialScope,
-          hash($this->mailer->hashAlgorithm, $canonicalRequest)
+          hash($this->mailer->hash_algorithm, $canonicalRequest)
         )
       );
   }
@@ -126,8 +127,8 @@ class AmazonSESCest {
     $signedRequest = $this->mailer->signRequest($body);
     expect($signedRequest)
       ->contains(
-        $this->mailer->awsSigningAlgorithm . ' Credential=' .
-        $this->mailer->awsAccessKey . '/' .
+        $this->mailer->aws_signing_algorithm . ' Credential=' .
+        $this->mailer->aws_access_key . '/' .
         $this->mailer->getCredentialScope() . ', ' .
         'SignedHeaders=host;x-amz-date, Signature='
       );
@@ -136,7 +137,7 @@ class AmazonSESCest {
   }
 
   function itCannotSendWithoutProperAccessKey() {
-    $this->mailer->awsAccessKey = 'somekey';
+    $this->mailer->aws_access_key = 'somekey';
     $result = $this->mailer->send(
       $this->newsletter,
       $this->subscriber
diff --git a/tests/unit/Mailer/Methods/ElasticEmailCest.php b/tests/unit/Mailer/Methods/ElasticEmailCest.php
index 6e01469a7f..d44296ffb6 100644
--- a/tests/unit/Mailer/Methods/ElasticEmailCest.php
+++ b/tests/unit/Mailer/Methods/ElasticEmailCest.php
@@ -8,12 +8,12 @@ class ElasticEmailCest {
       'method' => 'ElasticEmail',
       'api_key' => '997f1f7f-41de-4d7f-a8cb-86c8481370fa'
     );
-    $this->fromEmail = 'staff@mailpoet.com';
-    $this->fromName = 'Sender';
+    $this->from_email = 'staff@mailpoet.com';
+    $this->from_name = 'Sender';
     $this->mailer = new ElasticEmail(
       $this->settings['api_key'],
-      $this->fromEmail,
-      $this->fromName
+      $this->from_email,
+      $this->from_name
     );
     $this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
     $this->newsletter = array(
@@ -28,8 +28,8 @@ class ElasticEmailCest {
   function itCanGenerateBody() {
     $body = $this->mailer->getBody($this->newsletter, $this->subscriber);
     expect($body['api_key'])->equals($this->settings['api_key']);
-    expect($body['from'])->equals($this->fromEmail);
-    expect($body['from_name'])->equals($this->fromName);
+    expect($body['from'])->equals($this->from_email);
+    expect($body['from_name'])->equals($this->from_name);
     expect($body['to'])->contains($this->subscriber);
     expect($body['subject'])->equals($this->newsletter['subject']);
     expect($body['body_html'])->equals($this->newsletter['body']['html']);
@@ -45,8 +45,8 @@ class ElasticEmailCest {
     expect($request['body'])->equals(urldecode(http_build_query($body)));
   }
 
-  function itCannotSendWithoutProperAPIKey() {
-    $this->mailer->apiKey = 'someapi';
+  function itCannotSendWithoutProperApiKey() {
+    $this->mailer->api_key = 'someapi';
     $result = $this->mailer->send(
       $this->newsletter,
       $this->subscriber
diff --git a/tests/unit/Mailer/Methods/MailGunCest.php b/tests/unit/Mailer/Methods/MailGunCest.php
index b946949c60..0487e7a923 100644
--- a/tests/unit/Mailer/Methods/MailGunCest.php
+++ b/tests/unit/Mailer/Methods/MailGunCest.php
@@ -52,8 +52,8 @@ class MailGunCest {
     expect($request['body'])->equals(urldecode(http_build_query($body)));
   }
 
-  function itCannotSendWithoutProperAPIKey() {
-    $this->mailer->apiKey = 'someapi';
+  function itCannotSendWithoutProperApiKey() {
+    $this->mailer->api_key = 'someapi';
     $result = $this->mailer->send(
       $this->newsletter,
       $this->subscriber
diff --git a/tests/unit/Mailer/Methods/MailPoetCest.php b/tests/unit/Mailer/Methods/MailPoetCest.php
index f54f9996fb..fe95423c0d 100644
--- a/tests/unit/Mailer/Methods/MailPoetCest.php
+++ b/tests/unit/Mailer/Methods/MailPoetCest.php
@@ -8,12 +8,12 @@ class MailPoetCest {
       'method' => 'MailPoet',
       'api_key' => 'dhNSqj1XHkVltIliyQDvMiKzQShOA5rs0m_DdRUVZHU'
     );
-    $this->fromEmail = 'staff@mailpoet.com';
-    $this->fromName = 'Sender';
+    $this->from_email = 'staff@mailpoet.com';
+    $this->from_name = 'Sender';
     $this->mailer = new MailPoet(
       $this->settings['api_key'],
-      $this->fromEmail,
-      $this->fromName
+      $this->from_email,
+      $this->from_name
     );
     $this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
     $this->newsletter = array(
@@ -30,7 +30,7 @@ class MailPoetCest {
     $body = $this->mailer->getBody($this->newsletter, $subscriber);
     expect($body['to']['address'])->equals($subscriber['email']);
     expect($body['to']['name'])->equals($subscriber['name']);
-    expect($body['from']['address'])->equals($this->fromEmail);
+    expect($body['from']['address'])->equals($this->from_email);
     expect($body['subject'])->equals($this->newsletter['subject']);
     expect($body['html'])->equals($this->newsletter['body']['html']);
     expect($body['text'])->equals($this->newsletter['body']['text']);
@@ -76,8 +76,8 @@ class MailPoetCest {
       ->equals('Basic ' . base64_encode('api:' . $this->settings['api_key']));
   }
 
-  function itCannotSendWithoutProperAPIKey() {
-    $this->mailer->apiKey = 'someapi';
+  function itCannotSendWithoutProperApiKey() {
+    $this->mailer->api_key = 'someapi';
     $result = $this->mailer->send(
       $this->newsletter,
       $this->subscriber
diff --git a/tests/unit/Mailer/Methods/MandrillCest.php b/tests/unit/Mailer/Methods/MandrillCest.php
index 86b0774a8c..8c4219f85e 100644
--- a/tests/unit/Mailer/Methods/MandrillCest.php
+++ b/tests/unit/Mailer/Methods/MandrillCest.php
@@ -8,12 +8,12 @@ class MandrillCest {
       'method' => 'Mandrill',
       'api_key' => '692ys1B7REEoZN7R-dYwNA'
     );
-    $this->fromEmail = 'staff@mailpoet.com';
-    $this->fromName = 'Sender';
+    $this->from_email = 'staff@mailpoet.com';
+    $this->from_name = 'Sender';
     $this->mailer = new Mandrill(
       $this->settings['api_key'],
-      $this->fromEmail,
-      $this->fromName
+      $this->from_email,
+      $this->from_name
     );
     $this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
     $this->newsletter = array(
@@ -29,8 +29,8 @@ class MandrillCest {
     $subscriber = $this->mailer->processSubscriber($this->subscriber);
     $body = $this->mailer->getBody($this->newsletter, $subscriber);
     expect($body['key'])->equals($this->settings['api_key']);
-    expect($body['message']['from_email'])->equals($this->fromEmail);
-    expect($body['message']['from_name'])->equals($this->fromName);
+    expect($body['message']['from_email'])->equals($this->from_email);
+    expect($body['message']['from_name'])->equals($this->from_name);
     expect($body['message']['to'])->equals(array($subscriber));
     expect($body['message']['subject'])->equals($this->newsletter['subject']);
     expect($body['message']['html'])->equals($this->newsletter['body']['html']);
@@ -70,8 +70,8 @@ class MandrillCest {
         ));
   }
 
-  function itCannotSendWithoutProperAPIKey() {
-    $this->mailer->apiKey = 'someapi';
+  function itCannotSendWithoutProperApiKey() {
+    $this->mailer->api_key = 'someapi';
     $result = $this->mailer->send(
       $this->newsletter,
       $this->subscriber
diff --git a/tests/unit/Mailer/Methods/SMTPCest.php b/tests/unit/Mailer/Methods/SMTPCest.php
index a0ed11a25c..5fa70ec1dc 100644
--- a/tests/unit/Mailer/Methods/SMTPCest.php
+++ b/tests/unit/Mailer/Methods/SMTPCest.php
@@ -13,8 +13,8 @@ class SMTPCest {
       'authentication' => '1',
       'encryption' => 'tls'
     );
-    $this->fromEmail = 'staff@mailpoet.com';
-    $this->fromName = 'Sender';
+    $this->from_email = 'staff@mailpoet.com';
+    $this->from_name = 'Sender';
     $this->mailer = new SMTP(
       $this->settings['host'],
       $this->settings['port'],
@@ -22,8 +22,8 @@ class SMTPCest {
       $this->settings['login'],
       $this->settings['password'],
       $this->settings['encryption'],
-      $this->fromEmail,
-      $this->fromName
+      $this->from_email,
+      $this->from_name
     );
     $this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
     $this->newsletter = array(
@@ -54,7 +54,7 @@ class SMTPCest {
     expect($message->getTo())
       ->equals(array('mailpoet-phoenix-test@mailinator.com' => 'Recipient'));
     expect($message->getFrom())
-      ->equals(array($this->fromEmail => $this->fromName));
+      ->equals(array($this->from_email => $this->from_name));
     expect($message->getSubject())
       ->equals($this->newsletter['subject']);
     expect($message->getBody())
diff --git a/tests/unit/Mailer/Methods/SendGridCest.php b/tests/unit/Mailer/Methods/SendGridCest.php
index d7e6db3429..fe1135c772 100644
--- a/tests/unit/Mailer/Methods/SendGridCest.php
+++ b/tests/unit/Mailer/Methods/SendGridCest.php
@@ -8,12 +8,12 @@ class SendGridCest {
       'method' => 'SendGrid',
       'api_key' => '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'
     );
-    $this->fromEmail = 'staff@mailpoet.com';
-    $this->fromName = 'Sender';
+    $this->from_email = 'staff@mailpoet.com';
+    $this->from_name = 'Sender';
     $this->mailer = new SendGrid(
       $this->settings['api_key'],
-      $this->fromEmail,
-      $this->fromName
+      $this->from_email,
+      $this->from_name
     );
     $this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
     $this->newsletter = array(
@@ -28,8 +28,8 @@ class SendGridCest {
   function itCanGenerateBody() {
     $body = $this->mailer->getBody($this->newsletter, $this->subscriber);
     expect($body['to'])->contains($this->subscriber);
-    expect($body['from'])->equals($this->fromEmail);
-    expect($body['fromname'])->equals($this->fromName);
+    expect($body['from'])->equals($this->from_email);
+    expect($body['from_name'])->equals($this->from_name);
     expect($body['subject'])->equals($this->newsletter['subject']);
     expect($body['html'])->equals($this->newsletter['body']['html']);
     expect($body['text'])->equals($this->newsletter['body']['text']);
@@ -51,8 +51,8 @@ class SendGridCest {
       ->equals('Bearer ' . $this->settings['api_key']);
   }
   
-  function itCannotSendWithoutProperAPIKey() {
-    $this->mailer->apiKey = 'someapi';
+  function itCannotSendWithoutProperApiKey() {
+    $this->mailer->api_key = 'someapi';
     $result = $this->mailer->send(
       $this->newsletter,
       $this->subscriber
diff --git a/tests/unit/Mailer/Methods/WPMailCest.php b/tests/unit/Mailer/Methods/WPMailCest.php
index e76f2f4940..d070b31ddf 100644
--- a/tests/unit/Mailer/Methods/WPMailCest.php
+++ b/tests/unit/Mailer/Methods/WPMailCest.php
@@ -7,11 +7,11 @@ class WPMailCest {
     $this->settings = array(
       'method' => 'WPMail'
     );
-    $this->fromEmail = 'staff@mailpoet.com';
-    $this->fromName = 'Sender';
+    $this->from_email = 'staff@mailpoet.com';
+    $this->from_name = 'Sender';
     $this->mailer = new WPMail(
-      $this->fromEmail,
-      $this->fromName
+      $this->from_email,
+      $this->from_name
     );
     $this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
     $this->newsletter = array(
@@ -48,11 +48,11 @@ class WPMailCest {
   }
 
   function itCanSetFromName() {
-    expect($this->mailer->setFromName())->equals($this->fromName);
+    expect($this->mailer->setFromName())->equals($this->from_name);
   }
 
   function itCanSetFromEmail() {
-    expect($this->mailer->setFromName())->equals($this->fromName);
+    expect($this->mailer->setFromEmail())->equals($this->from_email);
   }
 
   function itCanSetContentType() {
diff --git a/tests/unit/Newsletter/RendererCest.php b/tests/unit/Newsletter/RendererCest.php
index 889388a275..0aee956d6f 100644
--- a/tests/unit/Newsletter/RendererCest.php
+++ b/tests/unit/Newsletter/RendererCest.php
@@ -20,7 +20,7 @@ class NewsletterRendererCest {
   }
 
   function itRendersCompleteNewsletter() {
-    $template = $this->renderer->renderAll();
+    $template = $this->renderer->render();
     $DOM = $this->queryDOM->parseStr($template);
 
     // we expect to have 4 column containers and 7 columns (1x1, 1x2, 1x3, 1x1)
diff --git a/tests/unit/Router/MailerCest.php b/tests/unit/Router/MailerCest.php
deleted file mode 100644
index 363d40ebdb..0000000000
--- a/tests/unit/Router/MailerCest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-use MailPoet\Router\Mailer;
-
-class MailerCest {
-  function __construct() {
-    $this->router = new Mailer();
-  }
-
-  function itCanConstruct() {
-    // TOFIX: "from" property doesn't exist on $this->router
-    // the sender should be explicitely defined in this unit test.
-    //expect($this->router->from)->equals('Sender <staff@mailpoet.com>');
-  }
-
-  function itCanTransformSubscriber() {
-    expect($this->router->transformSubscriber('test@email.com'))
-      ->equals('test@email.com');
-    expect($this->router->transformSubscriber(
-      array(
-        'email' => 'test@email.com'
-      ))
-    )->equals('test@email.com');
-    expect($this->router->transformSubscriber(
-      array(
-        'first_name' => 'First',
-        'email' => 'test@email.com'
-      ))
-    )->equals('First <test@email.com>');
-    expect($this->router->transformSubscriber(
-      array(
-        'last_name' => 'Last',
-        'email' => 'test@email.com'
-      ))
-    )->equals('Last <test@email.com>');
-    expect($this->router->transformSubscriber(
-      array(
-        'first_name' => 'First',
-        'last_name' => 'Last',
-        'email' => 'test@email.com'
-      ))
-    )->equals('First Last <test@email.com>');
-  }
-
-  function itCanConfigureMailer() {
-    // TOFIX: This fails because $this->router->mailer is not set
-    /*$mailer = $this->router->buildMailer();
-    $class = 'Mailpoet\\Mailer\\' .
-      ((isset($this->router->mailer['type'])) ?
-        $this->router->mailer['type'] . '\\' . $this->router->mailer['method'] :
-        $this->router->mailer['method']
-      );
-    expect($mailer instanceof $class)->true();
-    expect(method_exists($mailer, 'send'))->true();*/
-  }
-
-  function itCanSend() {
-    // TOFIX: This fails because $this->router->mailer is not set
-    /*$newsletter = array(
-      'subject' => 'testing Mailer router with ' . $this->router->mailer['method'],
-      'body' => array(
-        'html' => 'HTML body',
-        'text' => 'TEXT body'
-      )
-    );
-    $subscriber = array(
-      'first_name' => 'First',
-      'last_name' => 'Last',
-      'email' => 'mailpoet-phoenix-test@mailinator.com'
-    );
-    expect($this->router->send($newsletter, $subscriber))->true();*/
-  }
-}
\ No newline at end of file