diff --git a/src/ApnAdapter.php b/src/ApnAdapter.php
index a0dbe6d..83e17e8 100644
--- a/src/ApnAdapter.php
+++ b/src/ApnAdapter.php
@@ -10,12 +10,8 @@ class ApnAdapter
 {
     /**
      * Convert an ApnMessage instance into a Zend Apns Message.
-     *
-     * @param  \NotificationChannels\Apn\ApnMessage  $message
-     * @param  string  $token
-     * @return \Pushok\Notification
      */
-    public function adapt(ApnMessage $message, string $token)
+    public function adapt(ApnMessage $message, string $token): Notification
     {
         $alert = null;
 
diff --git a/src/ApnChannel.php b/src/ApnChannel.php
index 5ff7aba..77b0885 100644
--- a/src/ApnChannel.php
+++ b/src/ApnChannel.php
@@ -10,45 +10,23 @@
 
 class ApnChannel
 {
-    /**
-     * The Pushok\Client factory.
-     *
-     * @var \NotificationChannels\Apn\ClientFactory
-     */
-    protected $factory;
-
-    /**
-     * The event dispatcher.
-     *
-     * @var \Illuminate\Contracts\Events\Dispatcher
-     */
-    protected $events;
-
     /**
      * Create a new channel instance.
-     *
-     * @param  \NotificationChannels\Apn\ClientFactory  $factory
-     * @param  \Illuminate\Contracts\Events\Dispatcher  $events
      */
-    public function __construct(ClientFactory $factory, Dispatcher $events)
+    public function __construct(protected ClientFactory $factory, protected Dispatcher $events)
     {
-        $this->factory = $factory;
-        $this->events = $events;
+        //
     }
 
     /**
      * Send the notification to Apple Push Notification Service.
-     *
-     * @param  mixed  $notifiable
-     * @param  \Illuminate\Notifications\Notification  $notification
-     * @return array|void
      */
-    public function send($notifiable, Notification $notification)
+    public function send(mixed $notifiable, Notification $notification): ?array
     {
         $tokens = (array) $notifiable->routeNotificationFor('apn', $notification);
 
         if (empty($tokens)) {
-            return;
+            return null;
         }
 
         $message = $notification->toApn($notifiable);
@@ -64,13 +42,8 @@ public function send($notifiable, Notification $notification)
 
     /**
      * Send the message to the given tokens through the given client.
-     *
-     * @param  \Pushok\Client  $client
-     * @param  \NotificationChannels\Apn\ApnMessage  $message
-     * @param  array  $tokens
-     * @return array
      */
-    protected function sendNotifications(Client $client, ApnMessage $message, array $tokens)
+    protected function sendNotifications(Client $client, ApnMessage $message, array $tokens): array
     {
         foreach ($tokens as $token) {
             $client->addNotification((new ApnAdapter)->adapt($message, $token));
@@ -81,13 +54,8 @@ protected function sendNotifications(Client $client, ApnMessage $message, array
 
     /**
      * Dispatch failed events for notifications that weren't delivered.
-     *
-     * @param  mixed  $notifiable
-     * @param  \Illuminate\Notifications\Notification  $notification
-     * @param  array  $responses
-     * @return void
      */
-    protected function dispatchEvents($notifiable, $notification, array $responses)
+    protected function dispatchEvents(mixed $notifiable, Notification $notification, array $responses): void
     {
         foreach ($responses as $response) {
             if ($response->getStatusCode() === Response::APNS_SUCCESS) {
diff --git a/src/ApnMessage.php b/src/ApnMessage.php
index 4799908..2f10f1b 100644
--- a/src/ApnMessage.php
+++ b/src/ApnMessage.php
@@ -16,158 +16,114 @@ class ApnMessage
 
     /**
      * The title of the notification.
-     *
-     * @var string
      */
-    public $title;
+    public ?string $title = null;
 
     /**
      * The subtitle of the notification.
-     *
-     * @var string
      */
-    public $subtitle;
+    public ?string $subtitle = null;
 
     /**
      * The body of the notification.
-     *
-     * @var string
      */
-    public $body;
+    public ?string $body = null;
 
     /**
      * The badge of the notification.
-     *
-     * @var int
      */
-    public $badge;
+    public ?int $badge;
 
     /**
      * The sound of the notification.
-     *
-     * @var string|null
      */
-    public $sound;
+    public ?string $sound = null;
 
     /**
      * The interruption level of the notification.
-     *
-     * @var string|null
      */
-    public $interruptionLevel;
+    public ?string $interruptionLevel = null;
 
     /**
      * The category for action button.
-     *
-     * @var string|null
-     * */
-    public $category;
+     */
+    public ?string $category = null;
 
     /**
      * The thread ID of the notification.
-     *
-     * @var string|null
-     * */
-    public $threadId;
+     */
+    public ?string $threadId = null;
 
     /**
      * Value indicating incoming resource in the notification.
-     *
-     * @var int|null
      */
-    public $contentAvailable = null;
+    public ?int $contentAvailable = null;
 
     /**
      * The key to a title string in the Localizable.strings file for the current localization.
-     *
-     * @var string|null
      */
-    public $titleLocKey;
+    public ?string $titleLocKey = null;
 
     /**
      * Variable string values to appear in place of the format specifiers in title-loc-key.
-     *
-     * @var string|null
      */
-    public $titleLocArgs;
+    public ?array $titleLocArgs = null;
 
     /**
      * If a string is specified, the iOS system displays an alert that includes the Close and View buttons.
-     *
-     * @var string|null
      */
-    public $actionLocKey;
+    public ?string $actionLocKey = null;
 
     /**
      * A key to an alert-message string in a Localizable.strings file for the current localization.
-     *
-     * @var string|null
      */
-    public $locKey;
+    public ?string $locKey = null;
 
     /**
      * Variable string values to appear in place of the format specifiers in loc-key.
-     *
-     * @var array|null
      */
-    public $locArgs;
+    public ?array $locArgs = null;
 
     /**
      * Additional data of the notification.
-     *
-     * @var array
      */
-    public $custom = [];
+    public array $custom = [];
 
     /**
      * URL arguments of the notification.
-     *
-     * @var array
      */
-    public $urlArgs = [];
+    public array $urlArgs = [];
 
     /**
      * Value indicating when the message will expire.
-     *
-     * @var \string
      */
-    public $pushType = null;
+    public ?string $pushType = null;
 
     /**
      * The expiration time of the notification.
-     *
-     * @var \DateTime|null
      */
-    public $expiresAt = null;
+    public ?DateTime $expiresAt = null;
 
     /**
      * ID for the collapsing of similar notifications.
-     *
-     * @var string|null
      */
-    public $collapseId;
+    public ?string $collapseId = null;
 
     /**
      * A canonical UUID that is the unique ID for the notification.
      * APNs includes this value when reporting the error to your server.
-     *
-     * @var string|null
      */
-    public $apnsId;
+    public ?string $apnsId = null;
 
     /**
      * Message specific client.
-     *
-     * @var \Pushok\Client|null
      */
-    public $client = null;
+    public ?Client $client = null;
 
     /**
      * The notification service app extension flag.
-     *
-     * @var int|null
      */
-    public $mutableContent = null;
+    public ?int $mutableContent = null;
 
     /**
      * Custom alert for Edamov/Pushok.
@@ -177,38 +133,28 @@ class ApnMessage
     public $customAlert = null;
 
     /**
-     * @param  string|null  $title
-     * @param  string|null  $body
-     * @param  array  $custom
-     * @param  null|int  $badge
-     * @return static
+     * Create a new messages instance.
      */
-    public static function create($title = null, $body = null, $custom = [], $badge = null)
+    public function __construct(?string $title = null, ?string $body = null, array $custom = [], ?int $badge = null)
     {
-        return new static($title, $body, $custom, $badge);
+        $this->title = $title;
+        $this->body = $body;
+        $this->custom = $custom;
+        $this->badge = $badge;
     }
 
     /**
-     * @param  string|null  $title
-     * @param  string|null  $body
-     * @param  array  $custom
-     * @param  null|int  $badge
+     * Create a new message instance.
      */
-    public function __construct($title = null, $body = null, $custom = [], $badge = null)
+    public static function create(?string $title = null, ?string $body = null, array $custom = [], ?int $badge = null): static
     {
-        $this->title = $title;
-        $this->body = $body;
-        $this->custom = $custom;
-        $this->badge = $badge;
+        return new static($title, $body, $custom, $badge);
     }
 
     /**
      * Set the alert title of the notification.
-     *
-     * @param  string  $title
-     * @return $this
      */
-    public function title($title)
+    public function title(?string $title): self
     {
         $this->title = $title;
 
@@ -217,11 +163,8 @@ public function title($title)
 
     /**
      * Set the alert subtitle of the notification.
-     *
-     * @param  string  $subtitle
-     * @return $this
      */
-    public function subtitle($subtitle)
+    public function subtitle(?string $subtitle): self
     {
         $this->subtitle = $subtitle;
 
@@ -230,11 +173,8 @@ public function subtitle($subtitle)
 
     /**
      * Set the alert message of the notification.
-     *
-     * @param  string  $body
-     * @return $this
      */
-    public function body($body)
+    public function body(?string $body): self
     {
         $this->body = $body;
 
@@ -243,11 +183,8 @@ public function body($body)
 
     /**
      * Set the badge of the notification.
-     *
-     * @param  int  $badge
-     * @return $this
      */
-    public function badge($badge)
+    public function badge(?int $badge): self
     {
         $this->badge = $badge;
 
@@ -256,11 +193,8 @@ public function badge($badge)
 
     /**
      * Set the sound of the notification.
-     *
-     * @param  string|null  $sound
-     * @return $this
      */
-    public function sound($sound = 'default')
+    public function sound(?string $sound = 'default'): self
     {
         $this->sound = $sound;
 
@@ -269,11 +203,8 @@ public function sound($sound = 'default')
 
     /**
      * Set the interruptionLevel of the notification.
-     *
-     * @param  string|null  $interruptionLevel
-     * @return $this
      */
-    public function interruptionLevel($interruptionLevel = 'active')
+    public function interruptionLevel(?string $interruptionLevel = 'active'): self
     {
         $this->interruptionLevel = $interruptionLevel;
 
@@ -282,11 +213,8 @@ public function interruptionLevel($interruptionLevel = 'active')
 
     /**
      * Set category of the notification.
-     *
-     * @param  string|null  $category
-     * @return $this
      * */
-    public function category($category)
+    public function category(?string $category): self
     {
         $this->category = $category;
 
@@ -295,11 +223,8 @@ public function category($category)
 
     /**
      * Set thread ID of the notification.
-     *
-     * @param  string|null  $threadId
-     * @return $this
      * */
-    public function threadId($threadId)
+    public function threadId(?string $threadId): self
     {
         $this->threadId = $threadId;
 
@@ -308,11 +233,8 @@ public function threadId($threadId)
 
     /**
      * Set content available value of the notification.
-     *
-     * @param  int  $value
-     * @return $this
      */
-    public function contentAvailable($value = 1)
+    public function contentAvailable(?int $value = 1): self
     {
         $this->contentAvailable = $value;
 
@@ -321,11 +243,8 @@ public function contentAvailable($value = 1)
 
     /**
      * Set the push type of the notification.
-     *
-     * @param  string  $pushType
-     * @return $this
      */
-    public function pushType(string $pushType)
+    public function pushType(?string $pushType): self
     {
         $this->pushType = $pushType;
 
@@ -334,11 +253,8 @@ public function pushType(string $pushType)
 
     /**
      * Set the expiration time for the message.
-     *
-     * @param  \DateTime  $expiresAt
-     * @return $this
      */
-    public function expiresAt(DateTime $expiresAt)
+    public function expiresAt(DateTime $expiresAt): self
     {
         $this->expiresAt = $expiresAt;
 
@@ -347,11 +263,8 @@ public function expiresAt(DateTime $expiresAt)
 
     /**
      * Set the collapse ID of the notification.
-     *
-     * @param  string|null  $collapseId
-     * @return $this
      */
-    public function collapseId($collapseId)
+    public function collapseId(?string $collapseId): self
     {
         $this->collapseId = $collapseId;
 
@@ -359,12 +272,9 @@ public function collapseId($collapseId)
     }
 
     /**
-     * Set the apns ID.
-     *
-     * @param  string|null  $apnsId
-     * @return $this
+     * Set the APNS ID.
      */
-    public function apnsId($apnsId)
+    public function apnsId(?string $apnsId): self
     {
         $this->apnsId = $apnsId;
 
@@ -373,11 +283,8 @@ public function apnsId($apnsId)
 
     /**
      * Set a title-loc-key.
-     *
-     * @param  string|null  $titleLocKey
-     * @return $this
      */
-    public function titleLocKey($titleLocKey = null)
+    public function titleLocKey(?string $titleLocKey = null): self
     {
         $this->titleLocKey = $titleLocKey;
 
@@ -386,11 +293,8 @@ public function titleLocKey($titleLocKey = null)
 
     /**
      * Set the title-loc-args.
-     *
-     * @param  array|null  $titleLocArgs
-     * @return $this
      */
-    public function titleLocArgs(array $titleLocArgs = null)
+    public function titleLocArgs(array $titleLocArgs = null): self
     {
         $this->titleLocArgs = $titleLocArgs;
 
@@ -399,11 +303,8 @@ public function titleLocArgs(array $titleLocArgs = null)
 
     /**
      * Set an action-loc-key.
-     *
-     * @param  string|null  $actionLocKey
-     * @return $this
      */
-    public function actionLocKey($actionLocKey = null)
+    public function actionLocKey($actionLocKey = null): self
     {
         $this->actionLocKey = $actionLocKey;
 
@@ -412,11 +313,8 @@ public function actionLocKey($actionLocKey = null)
 
     /**
      * Set a loc-key.
-     *
-     * @param  string  $locKey
-     * @return $this
      */
-    public function setLocKey($locKey)
+    public function setLocKey(?string $locKey): self
     {
         $this->locKey = $locKey;
 
@@ -425,11 +323,8 @@ public function setLocKey($locKey)
 
     /**
      * Set the loc-args.
-     *
-     * @param  array  $locArgs
-     * @return $this
      */
-    public function setLocArgs($locArgs)
+    public function setLocArgs(?array $locArgs): self
     {
         $this->locArgs = $locArgs;
 
@@ -438,12 +333,8 @@ public function setLocArgs($locArgs)
 
     /**
      * Add custom data to the notification.
-     *
-     * @param  string  $key
-     * @param  mixed  $value
-     * @return $this
      */
-    public function custom($key, $value)
+    public function custom(string $key, mixed $value): self
     {
         $this->custom[$key] = $value;
 
@@ -454,9 +345,8 @@ public function custom($key, $value)
      * Sets custom alert value as JSON or Array.
      *
      * @param  string|array  $customAlert
-     * @return $this
      */
-    public function setCustomAlert($customAlert)
+    public function setCustomAlert($customAlert): self
     {
         $this->customAlert = $customAlert;
 
@@ -465,11 +355,8 @@ public function setCustomAlert($customAlert)
 
     /**
      * Override the data of the notification.
-     *
-     * @param  array  $custom
-     * @return $this
      */
-    public function setCustom($custom)
+    public function setCustom(array $custom): self
     {
         $this->custom = $custom;
 
@@ -478,12 +365,8 @@ public function setCustom($custom)
 
     /**
      * Add a URL argument to the notification.
-     *
-     * @param  string  $key
-     * @param  mixed  $value
-     * @return $this
      */
-    public function urlArg($key, $value)
+    public function urlArg(string $key, mixed $value): self
     {
         $this->urlArgs[$key] = $value;
 
@@ -492,11 +375,8 @@ public function urlArg($key, $value)
 
     /**
      * Override the URL arguemnts of the notification.
-     *
-     * @param  array  $urlArgs
-     * @return $this
      */
-    public function setUrlArgs($urlArgs)
+    public function setUrlArgs(array $urlArgs): self
     {
         $this->urlArgs = $urlArgs;
 
@@ -505,12 +385,8 @@ public function setUrlArgs($urlArgs)
 
     /**
      * Add an action to the notification.
-     *
-     * @param  string  $action
-     * @param  mixed  $params
-     * @return $this
      */
-    public function action($action, $params = null)
+    public function action(string $action, mixed $params = null): self
     {
         return $this->custom('action', [
             'action' => $action,
@@ -520,11 +396,8 @@ public function action($action, $params = null)
 
     /**
      * Set message specific client.
-     *
-     * @param \Pushok\Client
-     * @return $this
      */
-    public function via(Client $client)
+    public function via(Client $client): self
     {
         $this->client = $client;
 
@@ -533,11 +406,8 @@ public function via(Client $client)
 
     /**
      * Set mutable content value of the notification.
-     *
-     * @param  int  $value
-     * @return $this
      */
-    public function mutableContent($value = 1)
+    public function mutableContent(?int $value = 1): self
     {
         $this->mutableContent = $value;
 
diff --git a/src/ApnVoipChannel.php b/src/ApnVoipChannel.php
index 174e84b..31a609e 100644
--- a/src/ApnVoipChannel.php
+++ b/src/ApnVoipChannel.php
@@ -8,17 +8,13 @@ class ApnVoipChannel extends ApnChannel
 {
     /**
      * Send the notification to Apple Push Notification Service.
-     *
-     * @param  mixed  $notifiable
-     * @param  \Illuminate\Notifications\Notification  $notification
-     * @return array|void
      */
-    public function send($notifiable, Notification $notification)
+    public function send(mixed $notifiable, Notification $notification): ?array
     {
         $tokens = (array) $notifiable->routeNotificationFor('apn_voip', $notification);
 
         if (empty($tokens)) {
-            return;
+            return null;
         }
 
         $message = $notification->toApnVoip($notifiable);
diff --git a/src/ApnVoipMessage.php b/src/ApnVoipMessage.php
index 9a50b86..e4f575e 100644
--- a/src/ApnVoipMessage.php
+++ b/src/ApnVoipMessage.php
@@ -6,8 +6,6 @@ class ApnVoipMessage extends ApnMessage
 {
     /**
      * Value indicating when the message will expire.
-     *
-     * @var \string
      */
-    public $pushType = 'voip';
+    public ?string $pushType = 'voip';
 }
diff --git a/src/ClientFactory.php b/src/ClientFactory.php
index dda9544..a4b183e 100644
--- a/src/ClientFactory.php
+++ b/src/ClientFactory.php
@@ -16,37 +16,16 @@ class ClientFactory
      */
     const CACHE_MINUTES = 20;
 
-    /**
-     * The app instance.
-     *
-     * @var \Illuminate\Contracts\Container\Container
-     */
-    protected $app;
-
-    /**
-     * The cache repository instance.
-     *
-     * @var \Illuminate\Contracts\Cache\Repository
-     */
-    protected $cache;
-
     /**
      * Create a new factory instance.
-     *
-     * @param  \Illuminate\Contracts\Container\Container  $app
-     * @param  \Illuminate\Contracts\Cache\Repository  $cache
-     * @return void
      */
-    public function __construct(Container $app, Repository $cache)
+    public function __construct(protected Container $app, protected Repository $cache)
     {
-        $this->app = $app;
-        $this->cache = $cache;
+        //
     }
 
     /**
      * Get an instance of the Pushok client, holding on to each in the cache for the given length of time.
-     *
-     * @return \Pushok\Client
      */
     public function instance(): Client
     {
diff --git a/tests/ApnChannelTest.php b/tests/ApnChannelTest.php
index a393631..7b1ba20 100644
--- a/tests/ApnChannelTest.php
+++ b/tests/ApnChannelTest.php
@@ -45,7 +45,7 @@ public function it_can_send_a_notification_with_custom_client()
         $customClient->shouldReceive('addNotification');
         $customClient->shouldReceive('push')->once();
 
-        $this->channel->send(new TestNotifiable, (new TestNotificationWithClient($customClient)));
+        $this->channel->send(new TestNotifiable, new TestNotificationWithClient($customClient));
     }
 
     /** @test */
diff --git a/tests/ApnVoipChannelTest.php b/tests/ApnVoipChannelTest.php
index a38d4c6..dff5d8d 100644
--- a/tests/ApnVoipChannelTest.php
+++ b/tests/ApnVoipChannelTest.php
@@ -48,7 +48,7 @@ public function it_can_send_a_notification_with_custom_client()
         $customClient->shouldReceive('addNotification');
         $customClient->shouldReceive('push')->once();
 
-        $this->channel->send(new TestNotifiable, (new TestNotificationWithClient($customClient)));
+        $this->channel->send(new TestNotifiable, new TestNotificationWithClient($customClient));
     }
 
     /** @test */