diff --git a/DataStorage/Cache/CacheInterface.php b/DataStorage/Cache/CacheInterface.php
index 471f13913..fa226e42a 100644
--- a/DataStorage/Cache/CacheInterface.php
+++ b/DataStorage/Cache/CacheInterface.php
@@ -38,7 +38,7 @@ interface CacheInterface
      *
      * @since  1.0.0
      */
-    public function set($key, $value, int $expire = -1) /* : void */;
+    public function set($key, $value, int $expire = -1); /* : void */
 
     /**
      * Adding new data if it doesn't exist.
@@ -108,7 +108,7 @@ interface CacheInterface
      *
      * @since  1.0.0
      */
-    public function setStatus(int $status) /* : void */;
+    public function setStatus(int $status); /* : void */
 
     /**
      * Updating existing value/key.
diff --git a/DataStorage/Database/Connection/ConnectionInterface.php b/DataStorage/Database/Connection/ConnectionInterface.php
index 17881ae8d..f61209b5f 100644
--- a/DataStorage/Database/Connection/ConnectionInterface.php
+++ b/DataStorage/Database/Connection/ConnectionInterface.php
@@ -39,7 +39,7 @@ interface ConnectionInterface
      *
      * @since  1.0.0
      */
-    public function connect(array $dbdata) /* : void */;
+    public function connect(array $dbdata); /* : void */
 
     /**
      * Get the database type.
@@ -66,7 +66,7 @@ interface ConnectionInterface
      *
      * @since  1.0.0
      */
-    public function close() /* : void */;
+    public function close(); /* : void */
 
     /**
      * Return grammar for this connection.
diff --git a/DataStorage/Database/Query/Grammar/Grammar.php b/DataStorage/Database/Query/Grammar/Grammar.php
index 0af67e3a9..1d03401bd 100644
--- a/DataStorage/Database/Query/Grammar/Grammar.php
+++ b/DataStorage/Database/Query/Grammar/Grammar.php
@@ -254,7 +254,7 @@ class Grammar extends GrammarAbstract
         foreach ($wheres as $key => $where) {
             foreach ($where as $key2 => $element) {
                 $expression .= $this->compileWhereElement($element, $query, $first);
-                $first = false;
+                $first       = false;
             }
         }
 
@@ -299,7 +299,7 @@ class Grammar extends GrammarAbstract
         if (isset($element['value'])) {
             $expression .= ' ' . strtoupper($element['operator']) . ' ' . $this->compileValue($element['value'], $query->getPrefix());
         } else {
-            $operator = strtoupper($element['operator']) === '=' ? 'IS' : 'IS NOT';
+            $operator    = strtoupper($element['operator']) === '=' ? 'IS' : 'IS NOT';
             $expression .= ' ' . $operator . ' ' . $this->compileValue($element['value'], $query->getPrefix());
         }
 
@@ -434,7 +434,7 @@ class Grammar extends GrammarAbstract
                 $expression .= $this->compileSystem($column, $query->getPrefix()) . ', ';
             }
 
-            $expression = rtrim($expression, ', ');
+            $expression  = rtrim($expression, ', ');
             $expression .= ' ' . $key . ', ';
         }
 
diff --git a/DataStorage/Session/SessionInterface.php b/DataStorage/Session/SessionInterface.php
index a7e5c4538..3aa2e9449 100644
--- a/DataStorage/Session/SessionInterface.php
+++ b/DataStorage/Session/SessionInterface.php
@@ -71,7 +71,7 @@ interface SessionInterface
      *
      * @since  1.0.0
      */
-    public function save() /* : void */;
+    public function save(); /* : void */
 
     /**
      * @return int|string
@@ -87,7 +87,7 @@ interface SessionInterface
      *
      * @since  1.0.0
      */
-    public function setSID($sid) /* : void */;
+    public function setSID($sid); /* : void */
 
     /**
      * Lock session from further adjustments.
@@ -96,5 +96,5 @@ interface SessionInterface
      *
      * @since  1.0.0
      */
-    public function lock() /* : void */;
+    public function lock(); /* : void */
 }
diff --git a/Log/LoggerInterface.php b/Log/LoggerInterface.php
index 52a68d853..ea6b800a4 100644
--- a/Log/LoggerInterface.php
+++ b/Log/LoggerInterface.php
@@ -33,7 +33,7 @@ interface LoggerInterface
      *
      * @return null
      */
-    public function emergency(string $message, array $context = []) /* : void */;
+    public function emergency(string $message, array $context = []); /* : void */
 
     /**
      * Action must be taken immediately.
@@ -46,7 +46,7 @@ interface LoggerInterface
      *
      * @return null
      */
-    public function alert(string $message, array $context = []) /* : void */;
+    public function alert(string $message, array $context = []); /* : void */
 
     /**
      * Critical conditions.
@@ -58,7 +58,7 @@ interface LoggerInterface
      *
      * @return null
      */
-    public function critical(string $message, array $context = []) /* : void */;
+    public function critical(string $message, array $context = []); /* : void */
 
     /**
      * Runtime errors that do not require immediate action but should typically
@@ -69,7 +69,7 @@ interface LoggerInterface
      *
      * @return null
      */
-    public function error(string $message, array $context = []) /* : void */;
+    public function error(string $message, array $context = []); /* : void */
 
     /**
      * Exceptional occurrences that are not errors.
@@ -82,7 +82,7 @@ interface LoggerInterface
      *
      * @return null
      */
-    public function warning(string $message, array $context = []) /* : void */;
+    public function warning(string $message, array $context = []); /* : void */
 
     /**
      * Normal but significant events.
@@ -92,7 +92,7 @@ interface LoggerInterface
      *
      * @return null
      */
-    public function notice(string $message, array $context = []) /* : void */;
+    public function notice(string $message, array $context = []); /* : void */
 
     /**
      * Interesting events.
@@ -104,7 +104,7 @@ interface LoggerInterface
      *
      * @return null
      */
-    public function info(string $message, array $context = []) /* : void */;
+    public function info(string $message, array $context = []); /* : void */
 
     /**
      * Detailed debug information.
@@ -114,7 +114,7 @@ interface LoggerInterface
      *
      * @return null
      */
-    public function debug(string $message, array $context = []) /* : void */;
+    public function debug(string $message, array $context = []); /* : void */
 
     /**
      * Logs with an arbitrary level.
@@ -125,5 +125,5 @@ interface LoggerInterface
      *
      * @return null
      */
-    public function log(string $level, string $message, array $context = []) /* : void */;
+    public function log(string $level, string $message, array $context = []); /* : void */
 }
diff --git a/Math/Matrix/CholeskyDecomposition.php b/Math/Matrix/CholeskyDecomposition.php
index 0cafb3410..27cea1958 100644
--- a/Math/Matrix/CholeskyDecomposition.php
+++ b/Math/Matrix/CholeskyDecomposition.php
@@ -84,29 +84,29 @@ class CholeskyDecomposition
 
         // Solve L*Y = B;
         for ($k = 0; $k < $this->m; $k++) {
-	        for ($j = 0; $j < $n; $j++) {
-	            for ($i = 0; $i < $k ; $i++) {
-	                $X[$k][$j] -= $X[$i][$j] * $this->L[$k][$i];
+            for ($j = 0; $j < $n; $j++) {
+                for ($i = 0; $i < $k; $i++) {
+                    $X[$k][$j] -= $X[$i][$j] * $this->L[$k][$i];
                 }
 
-	            $X[$k][$j] /= $this->L[$k][$k];
-	        }
-	    }
+                $X[$k][$j] /= $this->L[$k][$k];
+            }
+        }
 
         // Solve L'*X = Y;
-	    for ($k = $this->m - 1; $k >= 0; $k--) {
-	        for ($j = 0; $j < $n; $j++) {
-	            for ($i = $k + 1; $i < $this->m ; $i++) {
-	                $X[$k][$j] -= $X[$i][$j] * $this->L[$i][$k];
+        for ($k = $this->m - 1; $k >= 0; $k--) {
+            for ($j = 0; $j < $n; $j++) {
+                for ($i = $k + 1; $i < $this->m; $i++) {
+                    $X[$k][$j] -= $X[$i][$j] * $this->L[$i][$k];
                 }
 
-	            $X[$k][$j] /= $this->L[$k][$k];
-	        }
-	    }
+                $X[$k][$j] /= $this->L[$k][$k];
+            }
+        }
 
         $solution = new Matrix();
         $solution->setMatrix($X);
 
         return $solution;
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Matrix/EigenvalueDecomposition.php b/Math/Matrix/EigenvalueDecomposition.php
index ba5f836dc..db05ab1f4 100644
--- a/Math/Matrix/EigenvalueDecomposition.php
+++ b/Math/Matrix/EigenvalueDecomposition.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Matrix;
 
 class EigenValueDecomposition
 {
-}
\ No newline at end of file
+}
diff --git a/Math/Matrix/LUDecomposition.php b/Math/Matrix/LUDecomposition.php
index 7b80a0848..df142551b 100644
--- a/Math/Matrix/LUDecomposition.php
+++ b/Math/Matrix/LUDecomposition.php
@@ -36,7 +36,7 @@ class LUDecomposition
         }
 
         $this->pivSign = 1;
-        $LUrowi = $LUcolj = [];
+        $LUrowi        = $LUcolj = [];
 
         for ($j = 0; $j < $this->n; ++$j) {
             for ($i = 0; $i < $this->m; ++$i) {
@@ -45,8 +45,8 @@ class LUDecomposition
 
             for ($i = 0; $i < $this->m; ++$i) {
                 $LUrowi = $this->LU[$i];
-                $kmax = min($i, $j);
-                $s = 0.0;
+                $kmax   = min($i, $j);
+                $s      = 0.0;
 
                 for ($k = 0; $k < $kmax; ++$k) {
                     $s += $LUrowi[$k] * $LUcolj[$k];
@@ -63,12 +63,12 @@ class LUDecomposition
 
             if ($p != $j) {
                 for ($k = 0; $k < $this->n; ++$k) {
-                    $t = $this->LU[$p][$k];
+                    $t                = $this->LU[$p][$k];
                     $this->LU[$p][$k] = $this->LU[$j][$k];
                     $this->LU[$j][$k] = $t;
                 }
 
-                $k = $this->piv[$p];
+                $k             = $this->piv[$p];
                 $this->piv[$p] = $this->piv[$j];
                 $this->piv[$j] = $k;
                 $this->pivSign = $this->pivSign * -1;
@@ -161,7 +161,7 @@ class LUDecomposition
         }
 
         $n = $B->getN();
-        $X  = $B->getMatrix($this->piv, 0, $n - 1);
+        $X = $B->getMatrix($this->piv, 0, $n - 1);
         // todo: fix get extract
 
         // Solve L*Y = B(piv,:)
@@ -190,4 +190,4 @@ class LUDecomposition
 
         return $solution;
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/Graph/Dijkstra.php b/Math/Optimization/Graph/Dijkstra.php
index aeaa75fae..1d9b901ee 100644
--- a/Math/Optimization/Graph/Dijkstra.php
+++ b/Math/Optimization/Graph/Dijkstra.php
@@ -83,4 +83,4 @@ class Dijkstra
 
         return $path;
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/Knappsack/Backpack.php b/Math/Optimization/Knappsack/Backpack.php
index 4a2f3f736..ddf12f207 100644
--- a/Math/Optimization/Knappsack/Backpack.php
+++ b/Math/Optimization/Knappsack/Backpack.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\Knappsack;
 class Backpack
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/Knappsack/BruteForce.php b/Math/Optimization/Knappsack/BruteForce.php
index d32e5d3d7..a5256b521 100644
--- a/Math/Optimization/Knappsack/BruteForce.php
+++ b/Math/Optimization/Knappsack/BruteForce.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\Knappsack;
 class BruteForce
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/Knappsack/GA.php b/Math/Optimization/Knappsack/GA.php
index 49df35edd..c2e1f5e86 100644
--- a/Math/Optimization/Knappsack/GA.php
+++ b/Math/Optimization/Knappsack/GA.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\Knappsack;
 class GA
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/Knappsack/Item.php b/Math/Optimization/Knappsack/Item.php
index e4b4099d0..7a4efc7f9 100644
--- a/Math/Optimization/Knappsack/Item.php
+++ b/Math/Optimization/Knappsack/Item.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\Knappsack;
 class Item
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/Knappsack/ItemPool.php b/Math/Optimization/Knappsack/ItemPool.php
index fcdfd8cee..0bce63059 100644
--- a/Math/Optimization/Knappsack/ItemPool.php
+++ b/Math/Optimization/Knappsack/ItemPool.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\Knappsack;
 class ItemPool
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/Knappsack/Population.php b/Math/Optimization/Knappsack/Population.php
index c17fb4ea3..88c5f44d2 100644
--- a/Math/Optimization/Knappsack/Population.php
+++ b/Math/Optimization/Knappsack/Population.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\Knappsack;
 class Population
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/ShiftScheduling/BruteForce.php b/Math/Optimization/ShiftScheduling/BruteForce.php
index e839bbf80..6f25fb820 100644
--- a/Math/Optimization/ShiftScheduling/BruteForce.php
+++ b/Math/Optimization/ShiftScheduling/BruteForce.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\ShiftScheduling;
 class BruteForce
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/ShiftScheduling/GA.php b/Math/Optimization/ShiftScheduling/GA.php
index 016987e25..39b8992dd 100644
--- a/Math/Optimization/ShiftScheduling/GA.php
+++ b/Math/Optimization/ShiftScheduling/GA.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\ShiftScheduling;
 class GA
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/ShiftScheduling/Population.php b/Math/Optimization/ShiftScheduling/Population.php
index 885137bf9..aef949866 100644
--- a/Math/Optimization/ShiftScheduling/Population.php
+++ b/Math/Optimization/ShiftScheduling/Population.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\ShiftScheduling;
 class Population
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/ShiftScheduling/Workday.php b/Math/Optimization/ShiftScheduling/Workday.php
index 59966a52c..d695b6362 100644
--- a/Math/Optimization/ShiftScheduling/Workday.php
+++ b/Math/Optimization/ShiftScheduling/Workday.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\ShiftScheduling;
 class Workday
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/ShiftScheduling/Worker.php b/Math/Optimization/ShiftScheduling/Worker.php
index 2ee093eda..9a6877ecd 100644
--- a/Math/Optimization/ShiftScheduling/Worker.php
+++ b/Math/Optimization/ShiftScheduling/Worker.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\ShiftScheduling;
 class Worker
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Optimization/ShiftScheduling/WorkerPool.php b/Math/Optimization/ShiftScheduling/WorkerPool.php
index f4c274cd7..24037d4ed 100644
--- a/Math/Optimization/ShiftScheduling/WorkerPool.php
+++ b/Math/Optimization/ShiftScheduling/WorkerPool.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Optimization\ShiftScheduling;
 class WorkerPool
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Statistic/Forecast/Forecasts.php b/Math/Statistic/Forecast/Forecasts.php
index 027c6c80f..b1f11637d 100644
--- a/Math/Statistic/Forecast/Forecasts.php
+++ b/Math/Statistic/Forecast/Forecasts.php
@@ -39,4 +39,4 @@ class Forecasts
     {
         return [$forecast - $interval * $standardDeviation, $forecast + $interval * $standardDeviation];
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Statistic/Forecast/Regression/LevelLevelRegression.php b/Math/Statistic/Forecast/Regression/LevelLevelRegression.php
index de0da33f6..3f07d39f4 100644
--- a/Math/Statistic/Forecast/Regression/LevelLevelRegression.php
+++ b/Math/Statistic/Forecast/Regression/LevelLevelRegression.php
@@ -39,4 +39,4 @@ class LevelLevelRegression extends RegressionAbstract
     {
         return $b1 * $y / $x;
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Statistic/Forecast/Regression/LevelLogRegression.php b/Math/Statistic/Forecast/Regression/LevelLogRegression.php
index ecb4b7d09..969553006 100644
--- a/Math/Statistic/Forecast/Regression/LevelLogRegression.php
+++ b/Math/Statistic/Forecast/Regression/LevelLogRegression.php
@@ -57,4 +57,4 @@ class LevelLogRegression extends RegressionAbstract
     {
         return $b1 / $x;
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Statistic/Forecast/Regression/LogLevelRegression.php b/Math/Statistic/Forecast/Regression/LogLevelRegression.php
index 0f73da14c..eebd46c4b 100644
--- a/Math/Statistic/Forecast/Regression/LogLevelRegression.php
+++ b/Math/Statistic/Forecast/Regression/LogLevelRegression.php
@@ -57,4 +57,4 @@ class LogLevelRegression extends RegressionAbstract
     {
         return $b1 * $x;
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Statistic/Forecast/Regression/LogLogRegression.php b/Math/Statistic/Forecast/Regression/LogLogRegression.php
index cf0587182..240abf9cb 100644
--- a/Math/Statistic/Forecast/Regression/LogLogRegression.php
+++ b/Math/Statistic/Forecast/Regression/LogLogRegression.php
@@ -58,4 +58,4 @@ class LogLogRegression extends RegressionAbstract
     {
         return $b1;
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Statistic/Forecast/Regression/MultipleLinearRegression.php b/Math/Statistic/Forecast/Regression/MultipleLinearRegression.php
index 3b8448e33..6ef7e510c 100644
--- a/Math/Statistic/Forecast/Regression/MultipleLinearRegression.php
+++ b/Math/Statistic/Forecast/Regression/MultipleLinearRegression.php
@@ -45,4 +45,4 @@ class MultipleLinearRegression
     public static function getPredictionInterval() : array
     {
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Statistic/Forecast/Regression/RegressionAbstract.php b/Math/Statistic/Forecast/Regression/RegressionAbstract.php
index e0e036495..9462f3784 100644
--- a/Math/Statistic/Forecast/Regression/RegressionAbstract.php
+++ b/Math/Statistic/Forecast/Regression/RegressionAbstract.php
@@ -184,4 +184,4 @@ abstract class RegressionAbstract
     {
         return 0.0;
     }
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/BetaDistribution.php b/Math/Stochastic/Distribution/BetaDistribution.php
index 656223af5..6fad5e480 100644
--- a/Math/Stochastic/Distribution/BetaDistribution.php
+++ b/Math/Stochastic/Distribution/BetaDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class BetaDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/FDistribution.php b/Math/Stochastic/Distribution/FDistribution.php
index 87063cc06..4f68672f1 100644
--- a/Math/Stochastic/Distribution/FDistribution.php
+++ b/Math/Stochastic/Distribution/FDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class FDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/GammaDistribution.php b/Math/Stochastic/Distribution/GammaDistribution.php
index 0d8f41743..6594f7416 100644
--- a/Math/Stochastic/Distribution/GammaDistribution.php
+++ b/Math/Stochastic/Distribution/GammaDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class GammaDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/HypergeometricDistribution.php b/Math/Stochastic/Distribution/HypergeometricDistribution.php
index f9f96011f..8b9f4580e 100644
--- a/Math/Stochastic/Distribution/HypergeometricDistribution.php
+++ b/Math/Stochastic/Distribution/HypergeometricDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class HypergeometricDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/LogDistribution.php b/Math/Stochastic/Distribution/LogDistribution.php
index 9f5a98d4c..4316c70f0 100644
--- a/Math/Stochastic/Distribution/LogDistribution.php
+++ b/Math/Stochastic/Distribution/LogDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class LogDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/LogNormalDistribution.php b/Math/Stochastic/Distribution/LogNormalDistribution.php
index f940bb447..56273cb41 100644
--- a/Math/Stochastic/Distribution/LogNormalDistribution.php
+++ b/Math/Stochastic/Distribution/LogNormalDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class LogNormalDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/LogisticDistribution.php b/Math/Stochastic/Distribution/LogisticDistribution.php
index 4673e43ed..753c8b09f 100644
--- a/Math/Stochastic/Distribution/LogisticDistribution.php
+++ b/Math/Stochastic/Distribution/LogisticDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class LogisticDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/ParetoDistribution.php b/Math/Stochastic/Distribution/ParetoDistribution.php
index 02e7f699f..ecfec6ae2 100644
--- a/Math/Stochastic/Distribution/ParetoDistribution.php
+++ b/Math/Stochastic/Distribution/ParetoDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class ParetoDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/TDistribution.php b/Math/Stochastic/Distribution/TDistribution.php
index a7c068ad2..841e80c34 100644
--- a/Math/Stochastic/Distribution/TDistribution.php
+++ b/Math/Stochastic/Distribution/TDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class TDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/Distribution/WeibullDistribution.php b/Math/Stochastic/Distribution/WeibullDistribution.php
index 315bc96a4..d36679322 100644
--- a/Math/Stochastic/Distribution/WeibullDistribution.php
+++ b/Math/Stochastic/Distribution/WeibullDistribution.php
@@ -16,4 +16,4 @@ namespace phpOMS\Math\Stochastic\Distribution;
 class WeibullDistribution
 {
 
-}
\ No newline at end of file
+}
diff --git a/Math/Stochastic/NaiveBayesFilter.php b/Math/Stochastic/NaiveBayesFilter.php
index 01a91e1ce..4a186b9cc 100644
--- a/Math/Stochastic/NaiveBayesFilter.php
+++ b/Math/Stochastic/NaiveBayesFilter.php
@@ -12,6 +12,7 @@
  */
 declare(strict_types = 1);
 namespace phpOMS\Math\Stochastic;
+
 /**
  * Bernulli distribution.
  *
diff --git a/Message/HeaderAbstract.php b/Message/HeaderAbstract.php
index cbeb60797..a77ad74d6 100644
--- a/Message/HeaderAbstract.php
+++ b/Message/HeaderAbstract.php
@@ -165,7 +165,7 @@ abstract class HeaderAbstract
      *
      * @since  1.0.0
      */
-    abstract public function generate(int $statusCode) /* : void */;
+    abstract public function generate(int $statusCode); /* : void */
 
     /**
      * Get status code
diff --git a/Message/Socket/Request.php b/Message/Socket/Request.php
index 184d9db48..d193044ec 100644
--- a/Message/Socket/Request.php
+++ b/Message/Socket/Request.php
@@ -16,4 +16,4 @@ namespace phpOMS\Message\Socket;
 class Request
 {
 
-}
\ No newline at end of file
+}
diff --git a/Message/Socket/Response.php b/Message/Socket/Response.php
index d31d41d10..8f8b9512e 100644
--- a/Message/Socket/Response.php
+++ b/Message/Socket/Response.php
@@ -16,4 +16,4 @@ namespace phpOMS\Message\Socket;
 class Response
 {
 
-}
\ No newline at end of file
+}
diff --git a/Module/PackageManager.php b/Module/PackageManager.php
index 6f15292ee..012724145 100644
--- a/Module/PackageManager.php
+++ b/Module/PackageManager.php
@@ -75,7 +75,7 @@ class PackageManager
      */
     public function __construct(string $path, string $basePath)
     {
-        $this->path = $path;
+        $this->path     = $path;
         $this->basePath = $basePath;
     }
 
@@ -279,4 +279,4 @@ class PackageManager
 
         return $unsignedHash === $rawHash;
     }
-}
\ No newline at end of file
+}
diff --git a/Socket/Client/ClientConnection.php b/Socket/Client/ClientConnection.php
index 3b9d9ee02..e3f97799c 100644
--- a/Socket/Client/ClientConnection.php
+++ b/Socket/Client/ClientConnection.php
@@ -24,10 +24,10 @@ namespace phpOMS\Socket\Client;
  */
 class ClientConnection
 {
-    private $id = 0;
-    private $socket = null;
+    private $id        = 0;
+    private $socket    = null;
     private $handshake = false;
-    private $pid = null;
+    private $pid       = null;
     private $connected = true;
 
     public function __construct($id, $socket)
diff --git a/Socket/Server/Server.php b/Socket/Server/Server.php
index f5ace21ca..61998d258 100644
--- a/Socket/Server/Server.php
+++ b/Socket/Server/Server.php
@@ -224,7 +224,7 @@ class Server extends SocketAbstract
     {
         $this->app->logger->debug('Connecting client...');
         $this->clientManager->add($client = new ClientConnection(uniqid(), $socket));
-        $this->conn[$client->getId()] = $socket;
+        $this->conn[$client->getId()]     = $socket;
         $this->app->logger->debug('Connected client.');
     }
 
diff --git a/Stdlib/Graph/BinaryTree.php b/Stdlib/Graph/BinaryTree.php
index 4fa99ea53..fbbdf1739 100644
--- a/Stdlib/Graph/BinaryTree.php
+++ b/Stdlib/Graph/BinaryTree.php
@@ -148,8 +148,8 @@ class BinaryTree extends Tree
         }
 
         $order[$horizontalDistance][] = $node;
-        $left = $this->getLeft($node);
-        $right = $this->getRight($node);
+        $left                         = $this->getLeft($node);
+        $right                        = $this->getRight($node);
 
         if (isset($left)) {
             $this->getVerticalOrder($left, $horizontalDistance - 1, $order);
@@ -196,10 +196,10 @@ class BinaryTree extends Tree
             return true;
         }
 
-        $left1 = $this->getLeft($node1);
+        $left1  = $this->getLeft($node1);
         $right1 = $this->getRight($node1);
 
-        $left2 = isset($node2) ? $this->getLeft($node1) : $this->getLeft($node2);
+        $left2  = isset($node2) ? $this->getLeft($node1) : $this->getLeft($node2);
         $right2 = isset($node2) ? $this->getRight($node1) : $this->getRight($node2);
 
         // todo: compare values? true symmetry requires the values to be the same
@@ -209,4 +209,4 @@ class BinaryTree extends Tree
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/Stdlib/Graph/Tree.php b/Stdlib/Graph/Tree.php
index 7b251eaa6..17d76e9fa 100644
--- a/Stdlib/Graph/Tree.php
+++ b/Stdlib/Graph/Tree.php
@@ -78,7 +78,7 @@ class Tree extends Graph
             return 0;
         }
 
-        $depth = 1;
+        $depth     = 1;
         $neighbors = $this->getNeighbors($currentNode);
 
         foreach ($neighbors as $neighbor) {
@@ -105,7 +105,7 @@ class Tree extends Graph
             return 0;
         }
 
-        $depth = [];
+        $depth     = [];
         $neighbors = $this->getNeighbors($currentNode);
 
         foreach ($neighbors as $neighbor) {
@@ -165,7 +165,7 @@ class Tree extends Graph
     {
         --$level;
         $neighbors = $this->getNeighbors($node);
-        $nodes = [];
+        $nodes     = [];
 
         if ($level === 1) {
             return $neighbors;
@@ -212,7 +212,8 @@ class Tree extends Graph
      *
      * @since  1.0.0
      */
-    public function preOrder(Node $node, \Closure $callback) {
+    public function preOrder(Node $node, \Closure $callback) 
+    {
         if (count($this->nodes) === 0) {
             return;
         }
@@ -234,7 +235,8 @@ class Tree extends Graph
      *
      * @since  1.0.0
      */
-    public function postOrder(Node $node, \Closure $callback) {
+    public function postOrder(Node $node, \Closure $callback) 
+    {
         if (count($this->nodes) === 0) {
             return;
         }
@@ -248,4 +250,4 @@ class Tree extends Graph
 
         $callback($node);
     }
-}
\ No newline at end of file
+}
diff --git a/Uri/UriInterface.php b/Uri/UriInterface.php
index 1950e3efd..99bf00bfe 100644
--- a/Uri/UriInterface.php
+++ b/Uri/UriInterface.php
@@ -126,7 +126,7 @@ interface UriInterface
      *
      * @since  1.0.0
      */
-    public function setRootPath(string $root) /* : void */;
+    public function setRootPath(string $root); /* : void */
 
     /**
      * Get path element.
@@ -213,5 +213,5 @@ interface UriInterface
      *
      * @since  1.0.0
      */
-    public function set(string $uri) /* : void */;
+    public function set(string $uri); /* : void */
 }
diff --git a/Validation/ValidatorInterface.php b/Validation/ValidatorInterface.php
index 3edc04932..b1e36403a 100644
--- a/Validation/ValidatorInterface.php
+++ b/Validation/ValidatorInterface.php
@@ -62,5 +62,5 @@ interface ValidatorInterface
      *
      * @since  1.0.0
      */
-    public static function resetError() /* : void */;
+    public static function resetError(); /* : void */
 }