diff --git a/src/OneSignalButton.php b/src/OneSignalButton.php
index 93fe450..79c029e 100644
--- a/src/OneSignalButton.php
+++ b/src/OneSignalButton.php
@@ -14,8 +14,7 @@ class OneSignalButton
     protected $icon;
 
     /**
-     * @param string $id
-     *
+     * @param  string  $id
      * @return static
      */
     public static function create($id)
@@ -24,7 +23,7 @@ public static function create($id)
     }
 
     /**
-     * @param string $id
+     * @param  string  $id
      */
     public function __construct($id)
     {
@@ -34,8 +33,7 @@ public function __construct($id)
     /**
      * Set the message icon.
      *
-     * @param string $value
-     *
+     * @param  string  $value
      * @return $this
      */
     public function icon($value)
@@ -48,8 +46,7 @@ public function icon($value)
     /**
      * Set the message subject.
      *
-     * @param string $value
-     *
+     * @param  string  $value
      * @return $this
      */
     public function text($value)
diff --git a/src/OneSignalChannel.php b/src/OneSignalChannel.php
index e206f31..9dc1a7d 100644
--- a/src/OneSignalChannel.php
+++ b/src/OneSignalChannel.php
@@ -20,10 +20,10 @@ public function __construct(OneSignalClient $oneSignal)
     /**
      * Send the given notification.
      *
-     * @param mixed $notifiable
-     * @param \Illuminate\Notifications\Notification $notification
-     *
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
      * @return \Psr\Http\Message\ResponseInterface
+     *
      * @throws \NotificationChannels\OneSignal\Exceptions\CouldNotSendNotification
      */
     public function send($notifiable, Notification $notification)
@@ -45,10 +45,9 @@ public function send($notifiable, Notification $notification)
     }
 
     /**
-     * @param mixed $notifiable
-     * @param \Illuminate\Notifications\Notification $notification
-     * @param mixed $targeting
-     *
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @param  mixed  $targeting
      * @return array
      */
     protected function payload($notifiable, $notification, $userIds)
diff --git a/src/OneSignalMessage.php b/src/OneSignalMessage.php
index b22c452..9e6ab3c 100644
--- a/src/OneSignalMessage.php
+++ b/src/OneSignalMessage.php
@@ -19,8 +19,7 @@ class OneSignalMessage
     protected $payload = [];
 
     /**
-     * @param string $body
-     *
+     * @param  string  $body
      * @return static
      */
     public static function create($body = '')
@@ -29,7 +28,7 @@ public static function create($body = '')
     }
 
     /**
-     * @param string $body
+     * @param  string  $body
      */
     public function __construct($body = '')
     {
@@ -39,8 +38,7 @@ public function __construct($body = '')
     /**
      * Set the message body.
      *
-     * @param mixed $value
-     *
+     * @param  mixed  $value
      * @return $this
      */
     public function setBody($value)
@@ -51,8 +49,7 @@ public function setBody($value)
     /**
      * Set the message subject.
      *
-     * @param mixed $value
-     *
+     * @param  mixed  $value
      * @return $this
      */
     public function setSubject($value)
@@ -63,8 +60,7 @@ public function setSubject($value)
     /**
      * Set the message template_id.
      *
-     * @param string $value
-     *
+     * @param  string  $value
      * @return $this
      */
     public function setTemplate($value)
@@ -75,8 +71,7 @@ public function setTemplate($value)
     }
 
     /**
-     * @param mixed $value
-     *
+     * @param  mixed  $value
      * @return array
      */
     protected function parseValueToArray($value)
@@ -87,9 +82,8 @@ protected function parseValueToArray($value)
     /**
      * Set additional data.
      *
-     * @param string $key
-     * @param mixed  $value
-     *
+     * @param  string  $key
+     * @param  mixed  $value
      * @return $this
      */
     public function setData(string $key, $value)
@@ -100,9 +94,8 @@ public function setData(string $key, $value)
     /**
      * Set parameters.
      *
-     * @param string $key
-     * @param mixed  $value
-     *
+     * @param  string  $key
+     * @param  mixed  $value
      * @return $this
      */
     public function setParameter(string $key, $value)
@@ -115,9 +108,8 @@ public function setParameter(string $key, $value)
     /**
      * Get parameters.
      *
-     * @param string $key
-     * @param mixed  $default
-     *
+     * @param  string  $key
+     * @param  mixed  $default
      * @return mixed
      */
     public function getParameter(string $key, $default = null)
diff --git a/src/OneSignalPayloadFactory.php b/src/OneSignalPayloadFactory.php
index 398ccc9..6e73a89 100644
--- a/src/OneSignalPayloadFactory.php
+++ b/src/OneSignalPayloadFactory.php
@@ -9,10 +9,9 @@ class OneSignalPayloadFactory
     /**
      * Make a one signal notification payload.
      *
-     * @param mixed $notifiable
-     * @param \Illuminate\Notifications\Notification $notification
-     * @param mixed $targeting
-     *
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @param  mixed  $targeting
      * @return array
      */
     public static function make($notifiable, Notification $notification, $targeting): array
@@ -43,8 +42,7 @@ public static function make($notifiable, Notification $notification, $targeting)
     }
 
     /**
-     * @param mixed $targeting
-     *
+     * @param  mixed  $targeting
      * @return bool
      */
     protected static function isTargetingIncludedSegments($targeting)
@@ -53,8 +51,7 @@ protected static function isTargetingIncludedSegments($targeting)
     }
 
     /**
-     * @param mixed $targeting
-     *
+     * @param  mixed  $targeting
      * @return bool
      */
     protected static function isTargetingExternalUserIds($targeting)
@@ -63,8 +60,7 @@ protected static function isTargetingExternalUserIds($targeting)
     }
 
     /**
-     * @param mixed $targeting
-     *
+     * @param  mixed  $targeting
      * @return bool
      */
     protected static function isTargetingExcludedSegments($targeting)
@@ -73,8 +69,7 @@ protected static function isTargetingExcludedSegments($targeting)
     }
 
     /**
-     * @param mixed $targeting
-     *
+     * @param  mixed  $targeting
      * @return bool
      */
     protected static function isTargetingEmail($targeting)
@@ -83,8 +78,7 @@ protected static function isTargetingEmail($targeting)
     }
 
     /**
-     * @param mixed $targeting
-     *
+     * @param  mixed  $targeting
      * @return bool
      */
     protected static function isTargetingTags($targeting)
diff --git a/src/OneSignalWebButton.php b/src/OneSignalWebButton.php
index 8c4bb44..251d5e0 100644
--- a/src/OneSignalWebButton.php
+++ b/src/OneSignalWebButton.php
@@ -17,8 +17,7 @@ class OneSignalWebButton
     protected $url;
 
     /**
-     * @param string $id
-     *
+     * @param  string  $id
      * @return static
      */
     public static function create($id)
@@ -27,7 +26,7 @@ public static function create($id)
     }
 
     /**
-     * @param string $id
+     * @param  string  $id
      */
     public function __construct($id)
     {
@@ -37,8 +36,7 @@ public function __construct($id)
     /**
      * Set the message icon.
      *
-     * @param string $value
-     *
+     * @param  string  $value
      * @return $this
      */
     public function icon($value)
@@ -51,8 +49,7 @@ public function icon($value)
     /**
      * Set the message subject.
      *
-     * @param string $value
-     *
+     * @param  string  $value
      * @return $this
      */
     public function text($value)
@@ -65,8 +62,7 @@ public function text($value)
     /**
      * Set the message url.
      *
-     * @param string $value
-     *
+     * @param  string  $value
      * @return $this
      */
     public function url($value)
diff --git a/src/Traits/Categories/AppearanceHelpers.php b/src/Traits/Categories/AppearanceHelpers.php
index d685f03..176dd0b 100644
--- a/src/Traits/Categories/AppearanceHelpers.php
+++ b/src/Traits/Categories/AppearanceHelpers.php
@@ -7,8 +7,7 @@ trait AppearanceHelpers
     /**
      * Set the iOS badge increment count.
      *
-     * @param int $count
-     *
+     * @param  int  $count
      * @return $this
      */
     public function incrementIosBadgeCount(int $count = 1)
@@ -20,8 +19,7 @@ public function incrementIosBadgeCount(int $count = 1)
     /**
      * Set the iOS badge decrement count.
      *
-     * @param int $count
-     *
+     * @param  int  $count
      * @return $this
      */
     public function decrementIosBadgeCount(int $count = 1)
@@ -33,8 +31,7 @@ public function decrementIosBadgeCount(int $count = 1)
     /**
      * Set the iOS badge count.
      *
-     * @param int $count
-     *
+     * @param  int  $count
      * @return $this
      */
     public function setIosBadgeCount(int $count)
@@ -46,8 +43,7 @@ public function setIosBadgeCount(int $count)
     /**
      * Set the iOS Sound.
      *
-     * @param string $soundUrl
-     *
+     * @param  string  $soundUrl
      * @return $this
      */
     public function setIosSound(string $soundUrl)
@@ -58,8 +54,7 @@ public function setIosSound(string $soundUrl)
     /**
      * Set the Android Sound.
      *
-     * @param string $soundUrl
-     *
+     * @param  string  $soundUrl
      * @return $this
      */
     public function setAndroidSound(string $soundUrl)
@@ -70,8 +65,7 @@ public function setAndroidSound(string $soundUrl)
     /**
      * Set the Windows Sound.
      *
-     * @param string $soundUrl
-     *
+     * @param  string  $soundUrl
      * @return $this
      */
     public function setWindowsSound(string $soundUrl)
@@ -83,8 +77,7 @@ public function setWindowsSound(string $soundUrl)
     /**
      * Set the Sound for all Systems.
      *
-     * @param string $soundUrl
-     *
+     * @param  string  $soundUrl
      * @return $this
      */
     public function setSound(string $soundUrl)
@@ -97,7 +90,7 @@ public function setSound(string $soundUrl)
     /**
      * Set the message icon.
      *
-     * @param string $iconPath
+     * @param  string  $iconPath
      *
      * @deprecated use setIcon instead
      *
@@ -111,8 +104,7 @@ public function icon(string $iconPath)
     /**
      * Set the message icon.
      *
-     * @param string $iconPath
-     *
+     * @param  string  $iconPath
      * @return $this
      */
     public function setIcon(string $iconPath)
diff --git a/src/Traits/Categories/AttachmentHelpers.php b/src/Traits/Categories/AttachmentHelpers.php
index e755d6e..ac3e17c 100644
--- a/src/Traits/Categories/AttachmentHelpers.php
+++ b/src/Traits/Categories/AttachmentHelpers.php
@@ -7,8 +7,7 @@ trait AttachmentHelpers
     /**
      * Set an Image/more than one Image only for iOS.
      *
-     * @param string|array $imageUrl
-     *
+     * @param  string|array  $imageUrl
      * @return $this
      */
     public function setIosAttachment($imageUrl)
@@ -21,8 +20,7 @@ public function setIosAttachment($imageUrl)
     /**
      * Set the Big Picture Image only for Android.
      *
-     * @param string $imageUrl
-     *
+     * @param  string  $imageUrl
      * @return $this
      */
     public function setAndroidBigPicture(string $imageUrl)
@@ -33,8 +31,7 @@ public function setAndroidBigPicture(string $imageUrl)
     /**
      * Set the Big Picture Image only for FireOS (Amazon).
      *
-     * @param string $imageUrl
-     *
+     * @param  string  $imageUrl
      * @return $this
      */
     public function setAmazonBigPicture(string $imageUrl)
@@ -45,8 +42,7 @@ public function setAmazonBigPicture(string $imageUrl)
     /**
      * Set the Big Picture Image only for Chrome.
      *
-     * @param string $imageUrl
-     *
+     * @param  string  $imageUrl
      * @return $this
      */
     public function setChromeBigPicture(string $imageUrl)
@@ -57,8 +53,7 @@ public function setChromeBigPicture(string $imageUrl)
     /**
      * Set the Web Image only for Chrome.
      *
-     * @param string $imageUrl
-     *
+     * @param  string  $imageUrl
      * @return $this
      */
     public function setChromeWebImage(string $imageUrl)
@@ -69,8 +64,7 @@ public function setChromeWebImage(string $imageUrl)
     /**
      * Set the additional URL for all Platforms.
      *
-     * @param string $url
-     *
+     * @param  string  $url
      * @return $this
      */
     public function setUrl(string $url)
@@ -81,8 +75,7 @@ public function setUrl(string $url)
     /**
      * Set an image to all possible attachment variables.
      *
-     * @param string $imageUrl
-     *
+     * @param  string  $imageUrl
      * @return $this
      */
     public function setImageAttachments(string $imageUrl)
diff --git a/src/Traits/Categories/ButtonHelpers.php b/src/Traits/Categories/ButtonHelpers.php
index 7b3dd06..77bff41 100644
--- a/src/Traits/Categories/ButtonHelpers.php
+++ b/src/Traits/Categories/ButtonHelpers.php
@@ -10,8 +10,7 @@ trait ButtonHelpers
     /**
      * Add a web button to the message.
      *
-     * @param OneSignalWebButton $button
-     *
+     * @param  OneSignalWebButton  $button
      * @return $this
      */
     public function setWebButton(OneSignalWebButton $button)
@@ -23,7 +22,6 @@ public function setWebButton(OneSignalWebButton $button)
      * Adds more than one web button to the message.
      *
      * @param array[OnSignalWebButton] $buttons
-     *
      * @return $this
      */
     public function setWebButtons(array $buttons)
@@ -38,8 +36,7 @@ public function setWebButtons(array $buttons)
     /**
      * Add a native button to the message.
      *
-     * @param OneSignalButton $button
-     *
+     * @param  OneSignalButton  $button
      * @return $this
      */
     public function setButton(OneSignalButton $button)
@@ -50,8 +47,7 @@ public function setButton(OneSignalButton $button)
     /**
      * Adds more than one native button to the message.
      *
-     * @param array $buttons
-     *
+     * @param  array  $buttons
      * @return $this
      */
     public function setButtons(array $buttons)
diff --git a/src/Traits/Categories/DeliveryHelpers.php b/src/Traits/Categories/DeliveryHelpers.php
index a98dff9..6c419a4 100644
--- a/src/Traits/Categories/DeliveryHelpers.php
+++ b/src/Traits/Categories/DeliveryHelpers.php
@@ -7,8 +7,7 @@ trait DeliveryHelpers
     /**
      * Set the send after.
      *
-     * @param string $date
-     *
+     * @param  string  $date
      * @return $this
      */
     public function setSendAfter(string $date)
@@ -19,8 +18,7 @@ public function setSendAfter(string $date)
     /**
      * Set the deplayed option.
      *
-     * @param string $delayedOption
-     *
+     * @param  string  $delayedOption
      * @return $this
      */
     public function setDelayedOption(string $delayedOption)
@@ -31,8 +29,7 @@ public function setDelayedOption(string $delayedOption)
     /**
      * Set the delivery at time of the day. Use with delayed option = timezone.
      *
-     * @param string $timeOfDay
-     *
+     * @param  string  $timeOfDay
      * @return $this
      */
     public function setDeliveryTimeOfDay(string $timeOfDay)
@@ -43,8 +40,7 @@ public function setDeliveryTimeOfDay(string $timeOfDay)
     /**
      * Set the Time to Live in Seconds.
      *
-     * @param int $ttl
-     *
+     * @param  int  $ttl
      * @return $this
      */
     public function setTtl(int $ttl)
@@ -55,8 +51,7 @@ public function setTtl(int $ttl)
     /**
      * Set the Priority.
      *
-     * @param int $priority
-     *
+     * @param  int  $priority
      * @return $this
      */
     public function setPriority(int $priority)
diff --git a/src/Traits/Categories/GroupingHelpers.php b/src/Traits/Categories/GroupingHelpers.php
index c6586fa..595b47a 100644
--- a/src/Traits/Categories/GroupingHelpers.php
+++ b/src/Traits/Categories/GroupingHelpers.php
@@ -7,9 +7,8 @@ trait GroupingHelpers
     /**
      * Set the Android Grouping Parameters.
      *
-     * @param string $group
-     * @param array  $groupMessage
-     *
+     * @param  string  $group
+     * @param  array  $groupMessage
      * @return $this
      */
     public function setAndroidGroup(string $group, array $groupMessage)
@@ -21,9 +20,8 @@ public function setAndroidGroup(string $group, array $groupMessage)
     /**
      * Set the Amazon (FireOS) Grouping Parameters.
      *
-     * @param string $group
-     * @param array  $groupMessage
-     *
+     * @param  string  $group
+     * @param  array  $groupMessage
      * @return $this
      */
     public function setAmazonGroup(string $group, array $groupMessage)
@@ -35,9 +33,8 @@ public function setAmazonGroup(string $group, array $groupMessage)
     /**
      * Set the Grouping Parameters for all available Systems (currently Android and Amazon (FireOs)).
      *
-     * @param string $group
-     * @param array  $groupMessage
-     *
+     * @param  string  $group
+     * @param  array  $groupMessage
      * @return $this
      */
     public function setGroup(string $group, array $groupMessage)
diff --git a/src/Traits/Deprecated.php b/src/Traits/Deprecated.php
index ee78b9d..698d520 100644
--- a/src/Traits/Deprecated.php
+++ b/src/Traits/Deprecated.php
@@ -10,7 +10,7 @@ trait Deprecated
     /**
      * Set the message body.
      *
-     * @param mixed $value
+     * @param  mixed  $value
      *
      * @deprecated use setBody instead
      *
@@ -24,7 +24,7 @@ public function body($value)
     /**
      * Set the message subject.
      *
-     * @param mixed $value
+     * @param  mixed  $value
      *
      * @deprecated Use setSubject instead
      *
@@ -38,7 +38,7 @@ public function subject($value)
     /**
      * Set the message url.
      *
-     * @param string $value
+     * @param  string  $value
      *
      * @deprecated use setUrl Instead
      *
@@ -52,7 +52,7 @@ public function url($value)
     /**
      * Add a web button to the message.
      *
-     * @param OneSignalWebButton $button
+     * @param  OneSignalWebButton  $button
      *
      * @deprecated use setWebButton instead
      *
@@ -80,9 +80,10 @@ public function webButtons(array $buttons)
     /**
      * Add a native button to the message.
      *
-     * @param OneSignalButton $button
+     * @param  OneSignalButton  $button
      *
      * @deprecated use setButton instead
+     *
      * @return $this
      */
     public function button(OneSignalButton $button)
@@ -93,7 +94,7 @@ public function button(OneSignalButton $button)
     /**
      * Adds more than one native button to the message.
      *
-     * @param array $buttons
+     * @param  array  $buttons
      *
      * @deprecated use setButtons instead
      *