diff --git a/src/Javascript/JavascriptRulesTrait.php b/src/Javascript/JavascriptRulesTrait.php
index 33aa1fd2..62e881a5 100644
--- a/src/Javascript/JavascriptRulesTrait.php
+++ b/src/Javascript/JavascriptRulesTrait.php
@@ -23,7 +23,7 @@ abstract public function parseNamedParameters($parameters);
     /**
      * Confirmed rule is applied to confirmed attribute.
      *
-     * @param $attribute
+     * @param  $attribute
      * @param  array  $parameters
      * @return array
      */
@@ -38,7 +38,7 @@ protected function ruleConfirmed($attribute, array $parameters)
     /**
      * Returns Javascript parameters for After rule.
      *
-     * @param $attribute
+     * @param  $attribute
      * @param  array  $parameters
      * @return array
      */
@@ -54,7 +54,7 @@ protected function ruleAfter($attribute, array $parameters)
     /**
      * Returns Javascript parameters for Before rule.
      *
-     * @param $attribute
+     * @param  $attribute
      * @param  array  $parameters
      * @return array
      */
diff --git a/src/Javascript/JavascriptValidator.php b/src/Javascript/JavascriptValidator.php
index 1b89ae24..d9e2d631 100644
--- a/src/Javascript/JavascriptValidator.php
+++ b/src/Javascript/JavascriptValidator.php
@@ -59,7 +59,7 @@ public function __construct(ValidatorHandler $validator, $options = [])
     /**
      * Set default parameters.
      *
-     * @param $options
+     * @param  $options
      * @return void
      */
     protected function setDefaults($options)
@@ -116,7 +116,7 @@ public function __toString()
     /**
      * Gets value from view data.
      *
-     * @param $name
+     * @param  $name
      * @return string
      *
      * @throws \Proengsoft\JsValidation\Exceptions\PropertyNotFoundException
diff --git a/src/Javascript/MessageParser.php b/src/Javascript/MessageParser.php
index fe5cd48f..760adf2e 100644
--- a/src/Javascript/MessageParser.php
+++ b/src/Javascript/MessageParser.php
@@ -58,7 +58,7 @@ public function getMessage($attribute, $rule, $parameters)
      *
      * @param  string  $attribute
      * @param  string  $rule
-     * @param $parameters
+     * @param  $parameters
      * @return array
      */
     protected function fakeValidationData($attribute, $rule, $parameters)
@@ -74,9 +74,9 @@ protected function fakeValidationData($attribute, $rule, $parameters)
     /**
      * Generate fake data to get RequiredIf message.
      *
-     * @param $data
-     * @param $rule
-     * @param $parameters
+     * @param  $data
+     * @param  $rule
+     * @param  $parameters
      * @return void
      */
     private function fakeRequiredIfData($data, $rule, $parameters)
@@ -93,8 +93,8 @@ private function fakeRequiredIfData($data, $rule, $parameters)
     /**
      * Generate fake data to get file type messages.
      *
-     * @param $data
-     * @param $attribute
+     * @param  $data
+     * @param  $attribute
      * @return void
      */
     private function fakeFileData($data, $attribute)
diff --git a/src/Javascript/RuleParser.php b/src/Javascript/RuleParser.php
index c8cc4505..a0347680 100644
--- a/src/Javascript/RuleParser.php
+++ b/src/Javascript/RuleParser.php
@@ -64,8 +64,8 @@ public function __construct(DelegatedValidator $validator, $remoteToken = null)
      *
      * @param  string  $attribute
      * @param  string  $rule
-     * @param $parameters
-     * @param $rawRule
+     * @param  $parameters
+     * @param  $rawRule
      * @return array
      */
     public function getRule($attribute, $rule, $parameters, $rawRule)
@@ -130,7 +130,7 @@ protected function isConditionalRule($attribute, $rule)
      *
      * @param  string  $attribute
      * @param  string  $rule
-     * @param $parameters
+     * @param  $parameters
      * @return array
      */
     protected function clientRule($attribute, $rule, $parameters)
diff --git a/src/Javascript/ValidatorHandler.php b/src/Javascript/ValidatorHandler.php
index e274e26c..b7138155 100644
--- a/src/Javascript/ValidatorHandler.php
+++ b/src/Javascript/ValidatorHandler.php
@@ -91,8 +91,8 @@ protected function generateJavascriptValidations()
     /**
      * Make Laravel Validations compatible with JQuery Validation Plugin.
      *
-     * @param $attribute
-     * @param $rules
+     * @param  $attribute
+     * @param  $rules
      * @param  bool  $includeRemote
      * @return array
      */
@@ -119,7 +119,7 @@ protected function jsConvertRules($attribute, $rules, $includeRemote)
     /**
      * Check if rule should be validated with javascript.
      *
-     * @param $jsRule
+     * @param  $jsRule
      * @param  bool  $includeRemote
      * @return bool
      */
@@ -131,7 +131,7 @@ protected function isValidatable($jsRule, $includeRemote)
     /**
      * Check if JS Validation is disabled for attribute.
      *
-     * @param $attribute
+     * @param  $attribute
      * @return bool
      */
     public function jsValidationEnabled($attribute)
diff --git a/src/JsValidatorFactory.php b/src/JsValidatorFactory.php
index 131b7155..eb7c0743 100644
--- a/src/JsValidatorFactory.php
+++ b/src/JsValidatorFactory.php
@@ -45,7 +45,7 @@ public function __construct($app, array $options = [])
     }
 
     /**
-     * @param $options
+     * @param  $options
      * @return void
      */
     protected function setOptions($options)
@@ -121,7 +121,7 @@ protected function getValidationData(array $rules, array $customAttributes = [])
     /**
      * Creates JsValidator instance based on FormRequest.
      *
-     * @param $formRequest
+     * @param  $formRequest
      * @param  null|string  $selector
      * @return \Proengsoft\JsValidation\Javascript\JavascriptValidator
      *
diff --git a/src/Remote/Resolver.php b/src/Remote/Resolver.php
index 1f9ce172..7bb31d3e 100644
--- a/src/Remote/Resolver.php
+++ b/src/Remote/Resolver.php
@@ -44,7 +44,7 @@ public function __construct(ValidationFactory $factory, $escape = false)
     /**
      * Closure used to resolve Validator instance.
      *
-     * @param $field
+     * @param  $field
      * @return \Closure
      */
     public function resolver($field)
@@ -57,12 +57,12 @@ public function resolver($field)
     /**
      * Resolves Validator instance.
      *
-     * @param $translator
-     * @param $data
-     * @param $rules
-     * @param $messages
-     * @param $customAttributes
-     * @param $field
+     * @param  $translator
+     * @param  $data
+     * @param  $rules
+     * @param  $messages
+     * @param  $customAttributes
+     * @param  $field
      * @return \Illuminate\Validation\Validator
      */
     protected function resolve($translator, $data, $rules, $messages, $customAttributes, $field)
@@ -78,11 +78,11 @@ protected function resolve($translator, $data, $rules, $messages, $customAttribu
     /**
      * Create new validator instance.
      *
-     * @param $translator
-     * @param $data
-     * @param $rules
-     * @param $messages
-     * @param $customAttributes
+     * @param  $translator
+     * @param  $data
+     * @param  $rules
+     * @param  $messages
+     * @param  $customAttributes
      * @return \Illuminate\Validation\Validator
      */
     protected function createValidator($translator, $data, $rules, $messages, $customAttributes)
diff --git a/src/Remote/Validator.php b/src/Remote/Validator.php
index 9250b6e0..99597401 100644
--- a/src/Remote/Validator.php
+++ b/src/Remote/Validator.php
@@ -48,8 +48,8 @@ public function __construct(BaseValidator $validator, $escape = false)
     /**
      * Validate request.
      *
-     * @param $field
-     * @param $parameters
+     * @param  $field
+     * @param  $parameters
      * @return void
      *
      * @throws \Illuminate\Validation\ValidationException
@@ -86,7 +86,7 @@ protected function throwValidationException($result, $validator)
     /**
      *  Parse Validation input request data.
      *
-     * @param $data
+     * @param  $data
      * @return array
      */
     protected function parseAttributeName($data)
@@ -101,7 +101,7 @@ protected function parseAttributeName($data)
     /**
      *  Parse Validation parameters.
      *
-     * @param $parameters
+     * @param  $parameters
      * @return array
      */
     protected function parseParameters($parameters)
@@ -117,7 +117,7 @@ protected function parseParameters($parameters)
     /**
      * Validate remote Javascript Validations.
      *
-     * @param $attribute
+     * @param  $attribute
      * @param  array  $parameters
      * @return array|bool
      */
@@ -144,7 +144,7 @@ protected function validateJsRemoteRequest($attribute, $parameters)
     /**
      * Sets data for validate remote rules.
      *
-     * @param $attribute
+     * @param  $attribute
      * @param  bool  $validateAll
      * @return void
      */
@@ -167,7 +167,7 @@ protected function setRemoteValidation($attribute, $validateAll = false)
     /**
      * Remove rules that should not be validated remotely.
      *
-     * @param $rules
+     * @param  $rules
      * @param  BaseValidator  $validator
      * @return mixed
      */
diff --git a/src/Support/AccessProtectedTrait.php b/src/Support/AccessProtectedTrait.php
index 54b0c992..12cd69e8 100644
--- a/src/Support/AccessProtectedTrait.php
+++ b/src/Support/AccessProtectedTrait.php
@@ -9,7 +9,7 @@ trait AccessProtectedTrait
     /**
      * Create closure to call inaccessible method.
      *
-     * @param $instance
+     * @param  $instance
      * @return \Closure
      */
     protected function createProtectedCaller($instance)
@@ -26,8 +26,8 @@ protected function createProtectedCaller($instance)
     /**
      * Gets inaccessible property.
      *
-     * @param $instance
-     * @param $property
+     * @param  $instance
+     * @param  $property
      * @return \Closure
      */
     protected function getProtected($instance, $property)
@@ -44,8 +44,8 @@ protected function getProtected($instance, $property)
      * Calls inaccessible method.
      *
      * @param  object|\Closure  $instance
-     * @param $method
-     * @param $args
+     * @param  $method
+     * @param  $args
      * @return mixed
      */
     protected function callProtected($instance, $method, $args = [])
diff --git a/src/Support/DelegatedValidator.php b/src/Support/DelegatedValidator.php
index 5f173833..ffd696f0 100644
--- a/src/Support/DelegatedValidator.php
+++ b/src/Support/DelegatedValidator.php
@@ -193,8 +193,8 @@ public function sometimes($attribute, $rules, callable $callback)
     /**
      * Delegate method calls to validator instance.
      *
-     * @param $method
-     * @param $params
+     * @param  $method
+     * @param  $params
      * @return mixed
      */
     public function __call($method, $params)
diff --git a/src/Support/RuleListTrait.php b/src/Support/RuleListTrait.php
index dab50840..b615cf3f 100644
--- a/src/Support/RuleListTrait.php
+++ b/src/Support/RuleListTrait.php
@@ -45,7 +45,7 @@ trait RuleListTrait
     /**
      * Returns if rule is validated using Javascript.
      *
-     * @param $rule
+     * @param  $rule
      * @return bool
      */
     protected function isImplemented($rule)
@@ -56,7 +56,7 @@ protected function isImplemented($rule)
     /**
      * Check if rule must be validated in server-side.
      *
-     * @param $rule
+     * @param  $rule
      * @return bool
      */
     protected function isRemoteRule($rule)
@@ -79,7 +79,7 @@ protected function isFormRequestRule($rule)
     /**
      * Check if rule disables rule processing.
      *
-     * @param $rule
+     * @param  $rule
      * @return bool
      */
     protected function isDisableRule($rule)
@@ -90,7 +90,7 @@ protected function isDisableRule($rule)
     /**
      * Check if rules should be validated.
      *
-     * @param $rules
+     * @param  $rules
      * @return bool
      */
     protected function validationDisabled($rules)
@@ -103,7 +103,7 @@ protected function validationDisabled($rules)
     /**
      * Check if rules is for input file type.
      *
-     * @param $rule
+     * @param  $rule
      * @return bool
      */
     protected function isFileRule($rule)