diff --git a/app/Listeners/Document/DeleteCompanyDocuments.php b/app/Listeners/Document/DeleteCompanyDocuments.php
index 8b8d5bcdbd58..d46d12b52fcf 100644
--- a/app/Listeners/Document/DeleteCompanyDocuments.php
+++ b/app/Listeners/Document/DeleteCompanyDocuments.php
@@ -21,7 +21,7 @@ class DeleteCompanyDocuments
     /**
      * Handle the event.
      *
-     * @param CompanyWasDeleted $event
+     * @param $event
      * @return void
      */
     public function handle($event)
diff --git a/app/Listeners/Mail/MailSentListener.php b/app/Listeners/Mail/MailSentListener.php
index 9978f076068b..b6228b8bf1d8 100644
--- a/app/Listeners/Mail/MailSentListener.php
+++ b/app/Listeners/Mail/MailSentListener.php
@@ -36,7 +36,7 @@ class MailSentListener implements ShouldQueue
     /**
      * Handle the event.
      *
-     * @param  object  $event
+     * @param  MessageSent $event
      * @return void
      */
     public function handle(MessageSent $event)
diff --git a/app/Listeners/Payment/PaymentEmailFailureActivity.php b/app/Listeners/Payment/PaymentEmailFailureActivity.php
index bcf9ca95983c..f9e725d52860 100644
--- a/app/Listeners/Payment/PaymentEmailFailureActivity.php
+++ b/app/Listeners/Payment/PaymentEmailFailureActivity.php
@@ -32,7 +32,7 @@ class PaymentEmailFailureActivity implements ShouldQueue
      * Handle the event.
      *
      * @param object $event
-     * @return bool
+     * @return void
      */
     public function handle($event)
     {
@@ -41,6 +41,6 @@ class PaymentEmailFailureActivity implements ShouldQueue
         $payment = $event->payment;
 
         nlog("i failed emailing {$payment->number}");
-        // nlog(print_r($event->errors,1));
+
     }
 }
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderCreatedListener.php b/app/Listeners/PurchaseOrder/PurchaseOrderCreatedListener.php
index 057743942d93..61a686de03b4 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderCreatedListener.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderCreatedListener.php
@@ -34,7 +34,7 @@ class PurchaseOrderCreatedListener implements ShouldQueue
     /**
      * Handle the event.
      *
-     * @param  object  $event
+     * @param  PurchaseOrderWasCreated $event
      * @return void
      */
     public function handle(PurchaseOrderWasCreated $event)
diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php
index 5f3254d14cf5..c51e9bddf662 100644
--- a/app/Models/ClientContact.php
+++ b/app/Models/ClientContact.php
@@ -415,9 +415,6 @@ class ClientContact extends Authenticatable implements HasLocalePreference
      */
     public function getLoginLink()
     {
-        // $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain();
-
-        // return $domain.'/client/key_login/'.$this->contact_key;
 
         if (Ninja::isHosted()) {
             $domain = $this->company->domain();
@@ -428,18 +425,13 @@ class ClientContact extends Authenticatable implements HasLocalePreference
         switch ($this->company->portal_mode) {
             case 'subdomain':
                 return $domain.'/client/key_login/'.$this->contact_key;
-                break;
             case 'iframe':
                 return $domain.'/client/key_login/'.$this->contact_key;
-                //return $domain . $entity_type .'/'. $this->contact->client->client_hash .'/'. $this->key;
-                break;
             case 'domain':
                 return $domain.'/client/key_login/'.$this->contact_key;
-                break;
 
             default:
                 return '';
-                break;
         }
     }
 }
diff --git a/app/Models/PurchaseOrderInvitation.php b/app/Models/PurchaseOrderInvitation.php
index c83a20aa25f2..8f22058d0712 100644
--- a/app/Models/PurchaseOrderInvitation.php
+++ b/app/Models/PurchaseOrderInvitation.php
@@ -153,17 +153,13 @@ class PurchaseOrderInvitation extends BaseModel
         switch ($this->company->portal_mode) {
             case 'subdomain':
                 return $domain.'/vendor/';
-                break;
             case 'iframe':
                 return $domain.'/vendor/';
-                break;
             case 'domain':
                 return $domain.'/vendor/';
-                break;
 
             default:
                 return '';
-                break;
         }
     }
 
@@ -180,17 +176,13 @@ class PurchaseOrderInvitation extends BaseModel
         switch ($this->company->portal_mode) {
             case 'subdomain':
                 return $domain.'/vendor/'.$entity_type.'/'.$this->key;
-                break;
             case 'iframe':
                 return $domain.'/vendor/'.$entity_type.'/'.$this->key;
-                break;
             case 'domain':
                 return $domain.'/vendor/'.$entity_type.'/'.$this->key;
-                break;
 
             default:
                 return '';
-                break;
         }
     }