diff --git a/Aggregation/RangeAggregation.php b/Aggregation/RangeAggregation.php
index b8ebf15780454b4f82a9f476cde2b71c68a7d213..942e555ce39e659b31b7e0c730d8bdb139b42060 100644
--- a/Aggregation/RangeAggregation.php
+++ b/Aggregation/RangeAggregation.php
@@ -49,7 +49,7 @@ class RangeAggregation extends AbstractAggregation
      */
     public function addRange($from = null, $to = null, $key = '')
     {
-        $range  = [];
+        $range = [];
 
         if (!empty($from)) {
             $range['from'] = $from;
diff --git a/Aggregation/Type/BucketingTrait.php b/Aggregation/Type/BucketingTrait.php
index 51a0a8cb93dafc980eac4756ebbeca32419cd56c..b0918e7562b09fdf17ceb621a4b0284d3b4b5487 100644
--- a/Aggregation/Type/BucketingTrait.php
+++ b/Aggregation/Type/BucketingTrait.php
@@ -11,6 +11,9 @@
 
 namespace ONGR\ElasticsearchBundle\DSL\Aggregation\Type;
 
+/**
+ * Trait used by Aggregations which supports nesting.
+ */
 trait BucketingTrait
 {
     /**
diff --git a/Aggregation/Type/MetricTrait.php b/Aggregation/Type/MetricTrait.php
index 1acafe489f32968a759840e34d5a53414afcbc72..26c1f922d35560bda29520bd382d344204bcc335 100644
--- a/Aggregation/Type/MetricTrait.php
+++ b/Aggregation/Type/MetricTrait.php
@@ -11,6 +11,9 @@
 
 namespace ONGR\ElasticsearchBundle\DSL\Aggregation\Type;
 
+/**
+ * Trait used by Aggregations which do not support nesting.
+ */
 trait MetricTrait
 {
     /**
diff --git a/BuilderInterface.php b/BuilderInterface.php
index abd30687b03fe0604fea88562ec4b0ea0abe66fe..cefbfce80f2eb5ae2fab8da6219da420eb763e5d 100644
--- a/BuilderInterface.php
+++ b/BuilderInterface.php
@@ -11,6 +11,9 @@
 
 namespace ONGR\ElasticsearchBundle\DSL;
 
+/**
+ * Interface BuilderInterface.
+ */
 interface BuilderInterface
 {
     /**
diff --git a/Filter/AbstractFilter.php b/Filter/AbstractFilter.php
index 6a6fe4230a09187506ae6451d8188b5ccf05bafd..662f85196ff5c566db1cd0a052e698084ecb8fd1 100644
--- a/Filter/AbstractFilter.php
+++ b/Filter/AbstractFilter.php
@@ -74,6 +74,7 @@ abstract class AbstractFilter
      */
     public function toArray()
     {
+        $output = [];
         $output[$this->filters->getType()] = $this->filters->toArray();
 
         return $output;
diff --git a/Filter/QueryFilter.php b/Filter/QueryFilter.php
index 74d0036f06493a845197a1a6077fdb53b22402e7..1ea4b687714d47045cb71432e6ccffc65732135f 100644
--- a/Filter/QueryFilter.php
+++ b/Filter/QueryFilter.php
@@ -54,6 +54,7 @@ class QueryFilter implements BuilderInterface
     public function toArray()
     {
         if ($this->hasParameter('_cache')) {
+            $query = [];
             $query['query'] = [$this->query->getType() => $this->query->toArray()];
             $output = $this->processArray($query);
 
diff --git a/Query/FilteredQuery.php b/Query/FilteredQuery.php
index 21b1ec45592c72dd028baa6a7c6454eeb8773125..73b32440cc7dfecabc6850f68870e1c3ef9c8864 100644
--- a/Query/FilteredQuery.php
+++ b/Query/FilteredQuery.php
@@ -27,7 +27,7 @@ class FilteredQuery extends AbstractFilter implements BuilderInterface
     private $query;
 
     /**
-     * @param Query  $query
+     * @param Query $query
      */
     public function __construct($query = null)
     {
@@ -68,6 +68,7 @@ class FilteredQuery extends AbstractFilter implements BuilderInterface
      */
     public function toArray()
     {
+        $output = [];
         $output['filter'] = parent::toArray();
 
         if ($this->query !== null) {
diff --git a/Suggester/Completion.php b/Suggester/Completion.php
index 697c5bcafc45293be17a091f504ee47f1566bf04..767d6bb93ade6adddb6062b8753d44f60ba2435a 100644
--- a/Suggester/Completion.php
+++ b/Suggester/Completion.php
@@ -74,7 +74,7 @@ class Completion extends AbstractSuggester
         );
 
         $completion = [
-            'field' => $this->getField()
+            'field' => $this->getField(),
         ];
 
         if (empty($fuzzy) && $this->isFuzzy()) {
diff --git a/Suggester/Term.php b/Suggester/Term.php
index 283f3f34a2247bca5612e2476b5eebf61bd9bab0..f56d4c71410c8dd8070d525275d9f46cd383ba81 100644
--- a/Suggester/Term.php
+++ b/Suggester/Term.php
@@ -75,7 +75,7 @@ class Term extends AbstractSuggester
                     'size' => $this->getSize(),
                     'term' => $suggester,
                 ]
-            )
+            ),
         ];
     }