diff --git a/src/AuthorizationServer.php b/src/AuthorizationServer.php
index 91dbe572b..4f3739389 100644
--- a/src/AuthorizationServer.php
+++ b/src/AuthorizationServer.php
@@ -102,7 +102,7 @@ public function addGrantType(GrantTypeInterface $grantType, $identifier = null)
 
     /**
      * Check if a grant type has been enabled
-     * @param  string  $identifier The grant type identifier
+     * @param  string $identifier The grant type identifier
      * @return boolean Returns "true" if enabled, "false" if not
      */
     public function hasGrantType($identifier)
@@ -247,7 +247,7 @@ public function issueAccessToken()
 
     /**
      * Return a grant type class
-     * @param  string                   $grantType The grant type identifier
+     * @param  string $grantType The grant type identifier
      * @return Grant\GrantTypeInterface
      * @throws
      */
diff --git a/src/Grant/AbstractGrant.php b/src/Grant/AbstractGrant.php
index eca92d30b..2ea5fd58f 100644
--- a/src/Grant/AbstractGrant.php
+++ b/src/Grant/AbstractGrant.php
@@ -92,7 +92,7 @@ public function getAccessTokenTTL()
 
     /**
      * Override the default access token expire time
-     * @param  int  $accessTokenTTL
+     * @param  int $accessTokenTTL
      * @return self
      */
     public function setAccessTokenTTL($accessTokenTTL)
@@ -114,9 +114,9 @@ public function setAuthorizationServer(AuthorizationServer $server)
 
     /**
      * Given a list of scopes, validate them and return an array of Scope entities
-     * @param  string                                                $scopeParam  A string of scopes (e.g. "profile email birthday")
-     * @param  \League\OAuth2\Server\Entity\ClientEntity             $client      Client entity
-     * @param  string|null                                           $redirectUri The redirect URI to return the user to
+     * @param  string                                    $scopeParam  A string of scopes (e.g. "profile email birthday")
+     * @param  \League\OAuth2\Server\Entity\ClientEntity $client      Client entity
+     * @param  string|null                               $redirectUri The redirect URI to return the user to
      * @return \League\OAuth2\Server\Entity\ScopeEntity[]
      * @throws \League\OAuth2\Server\Exception\InvalidScopeException If scope is invalid, or no scopes passed when required
      * @throws
diff --git a/src/Grant/AuthCodeGrant.php b/src/Grant/AuthCodeGrant.php
index e8c5d6125..3773c0834 100644
--- a/src/Grant/AuthCodeGrant.php
+++ b/src/Grant/AuthCodeGrant.php
@@ -57,7 +57,7 @@ class AuthCodeGrant extends AbstractGrant
 
     /**
      * Override the default access token expire time
-     * @param  int  $authTokenTTL
+     * @param  int $authTokenTTL
      * @return void
      */
     public function setAuthTokenTTL($authTokenTTL)
@@ -118,11 +118,11 @@ public function checkAuthorizeParams()
         $scopes = $this->validateScopes($scopeParam, $client, $redirectUri);
 
         return [
-            'client'        =>  $client,
-            'redirect_uri'  =>  $redirectUri,
-            'state'         =>  $state,
-            'response_type' =>  $responseType,
-            'scopes'        =>  $scopes
+            'client'        => $client,
+            'redirect_uri'  => $redirectUri,
+            'state'         => $state,
+            'response_type' => $responseType,
+            'scopes'        => $scopes
         ];
     }
 
diff --git a/src/Grant/PasswordGrant.php b/src/Grant/PasswordGrant.php
index 8130ade1f..e545f5ec6 100644
--- a/src/Grant/PasswordGrant.php
+++ b/src/Grant/PasswordGrant.php
@@ -65,7 +65,7 @@ public function setVerifyCredentialsCallback(callable $callback)
      */
     protected function getVerifyCredentialsCallback()
     {
-        if (is_null($this->callback) || ! is_callable($this->callback)) {
+        if (is_null($this->callback) || !is_callable($this->callback)) {
             throw new Exception\ServerErrorException('Null or non-callable callback set on Password grant');
         }
 
diff --git a/src/Grant/RefreshTokenGrant.php b/src/Grant/RefreshTokenGrant.php
index c12c62a97..27c705506 100644
--- a/src/Grant/RefreshTokenGrant.php
+++ b/src/Grant/RefreshTokenGrant.php
@@ -36,7 +36,7 @@ class RefreshTokenGrant extends AbstractGrant
 
     /**
      * Set the TTL of the refresh token
-     * @param  int  $refreshTokenTTL
+     * @param  int $refreshTokenTTL
      * @return void
      */
     public function setRefreshTokenTTL($refreshTokenTTL)