diff --git a/src/Contracts/VarnishableModel.php b/src/Contracts/VarnishableModel.php
index 1f6ebdd..ac02706 100644
--- a/src/Contracts/VarnishableModel.php
+++ b/src/Contracts/VarnishableModel.php
@@ -7,17 +7,19 @@ interface VarnishableModel
     /**
      * Fill the model with an array of attributes.
      *
-     * @param  array  $attributes
-     * @return $this
+     * @param array $attributes
      *
      * @throws \Illuminate\Database\Eloquent\MassAssignmentException
+     *
+     * @return $this
      */
     public function fill(array $attributes);
 
     /**
      * Get an attribute from the model.
      *
-     * @param  string  $key
+     * @param string $key
+     *
      * @return mixed
      */
     public function getAttribute($key);
@@ -39,8 +41,9 @@ public function newQuery();
     /**
      * Set a given attribute on the model.
      *
-     * @param  string  $key
-     * @param  mixed  $value
+     * @param string $key
+     * @param mixed  $value
+     *
      * @return mixed
      */
     public function setAttribute($key, $value);
diff --git a/src/Events/ModelHasUpdated.php b/src/Events/ModelHasUpdated.php
index a1839be..59f20a3 100644
--- a/src/Events/ModelHasUpdated.php
+++ b/src/Events/ModelHasUpdated.php
@@ -53,8 +53,9 @@ public function __construct(VarnishableModel $model)
      * Create dirty eloquent model object
      * based on the last saved model data.
      *
-     * @return VarnishableModel
      * @throws Exception
+     *
+     * @return VarnishableModel
      */
     protected function createDirtyModel(): VarnishableModel
     {
@@ -92,8 +93,9 @@ protected function getQuery(VarnishableModel $model): Builder
     /**
      * Model accessor.
      *
-     * @return VarnishableModel
      * @throws Exception
+     *
+     * @return VarnishableModel
      */
     public function model(): VarnishableModel
     {
@@ -103,8 +105,9 @@ public function model(): VarnishableModel
     /**
      * Initialize a new VarnishableModel object.
      *
-     * @return VarnishableModel
      * @throws Exception
+     *
+     * @return VarnishableModel
      */
     protected function newModel(): VarnishableModel
     {
@@ -123,8 +126,9 @@ protected function newModel(): VarnishableModel
      * Retrieve fresh eloquent model from
      * run-time cache or the database.
      *
-     * @return VarnishableModel|null
      * @throws Exception
+     *
+     * @return VarnishableModel|null
      */
     protected function retrieveModel(): ?VarnishableModel
     {
diff --git a/src/VarnishableObserver.php b/src/VarnishableObserver.php
index af1ee30..b0f75d2 100644
--- a/src/VarnishableObserver.php
+++ b/src/VarnishableObserver.php
@@ -83,8 +83,9 @@ public function restored(VarnishableModel $model): void
      *
      * @param VarnishableModel $model
      *
-     * @return void
      * @throws Exception
+     *
+     * @return void
      */
     public function retrieved(VarnishableModel $model): void
     {
@@ -108,8 +109,9 @@ public function saved(VarnishableModel $model): void
      *
      * @param VarnishableModel $model
      *
-     * @return void
      * @throws Exception
+     *
+     * @return void
      */
     public function wakeup(VarnishableModel $model): void
     {
diff --git a/src/VarnishableService.php b/src/VarnishableService.php
index 372b725..dc53167 100644
--- a/src/VarnishableService.php
+++ b/src/VarnishableService.php
@@ -33,6 +33,7 @@ class VarnishableService
      * Class constructor.
      *
      * @param \GuzzleHttp\Client $guzzle
+     *
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
@@ -71,9 +72,10 @@ public function getGuzzle(): Client
     /**
      * Load the configurations.
      *
-     * @return void
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
+     *
+     * @return void
      */
     public function loadConfig(): void
     {