diff --git a/src/Console/ElasticIndexDropCommand.php b/src/Console/ElasticIndexDropCommand.php
index a0f1289..ae69c2b 100644
--- a/src/Console/ElasticIndexDropCommand.php
+++ b/src/Console/ElasticIndexDropCommand.php
@@ -32,7 +32,7 @@ public function handle()
         $configurator = $this->getIndexConfigurator();
         $indexName = $this->resolveIndexName($configurator);
 
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('index', $indexName)
             ->get();
 
@@ -52,7 +52,7 @@ public function handle()
     protected function resolveIndexName($configurator)
     {
         if (in_array(Migratable::class, class_uses_recursive($configurator))) {
-            $payload = (new RawPayload())
+            $payload = (new RawPayload)
                 ->set('name', $configurator->getWriteAlias())
                 ->get();
 
diff --git a/src/Console/ElasticIndexUpdateCommand.php b/src/Console/ElasticIndexUpdateCommand.php
index ec54878..80ac239 100644
--- a/src/Console/ElasticIndexUpdateCommand.php
+++ b/src/Console/ElasticIndexUpdateCommand.php
@@ -85,7 +85,7 @@ protected function createWriteAlias()
 
         $indices = ElasticClient::indices();
 
-        $existsPayload = (new RawPayload())
+        $existsPayload = (new RawPayload)
             ->set('name', $configurator->getWriteAlias())
             ->get();
 
diff --git a/src/Console/ElasticMigrateCommand.php b/src/Console/ElasticMigrateCommand.php
index 252b387..5c4db2e 100644
--- a/src/Console/ElasticMigrateCommand.php
+++ b/src/Console/ElasticMigrateCommand.php
@@ -50,7 +50,7 @@ protected function isTargetIndexExists()
     {
         $targetIndex = $this->argument('target-index');
 
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('index', $targetIndex)
             ->get();
 
@@ -70,7 +70,7 @@ protected function createTargetIndex()
         $sourceIndexConfigurator = $this->getModel()
             ->getIndexConfigurator();
 
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('index', $targetIndex)
             ->setIfNotEmpty('body.settings', $sourceIndexConfigurator->getSettings())
             ->get();
@@ -97,7 +97,7 @@ protected function updateTargetIndex()
         $sourceIndexConfigurator = $this->getModel()
             ->getIndexConfigurator();
 
-        $targetIndexPayload = (new RawPayload())
+        $targetIndexPayload = (new RawPayload)
             ->set('index', $targetIndex)
             ->get();
 
@@ -107,7 +107,7 @@ protected function updateTargetIndex()
             $indices->close($targetIndexPayload);
 
             if ($settings = $sourceIndexConfigurator->getSettings()) {
-                $targetIndexSettingsPayload = (new RawPayload())
+                $targetIndexSettingsPayload = (new RawPayload)
                     ->set('index', $targetIndex)
                     ->set('body.settings', $settings)
                     ->get();
@@ -155,7 +155,7 @@ protected function updateTargetIndexMapping()
             return;
         }
 
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('index', $targetIndex)
             ->set('type', $targetType)
             ->set('include_type_name', 'true')
@@ -179,7 +179,7 @@ protected function updateTargetIndexMapping()
      */
     protected function isAliasExists($name)
     {
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('name', $name)
             ->get();
 
@@ -195,7 +195,7 @@ protected function isAliasExists($name)
      */
     protected function getAlias($name)
     {
-        $getPayload = (new RawPayload())
+        $getPayload = (new RawPayload)
             ->set('name', $name)
             ->get();
 
@@ -218,7 +218,7 @@ protected function deleteAlias($name)
         }
 
         foreach ($aliases as $index => $alias) {
-            $deletePayload = (new RawPayload())
+            $deletePayload = (new RawPayload)
                 ->set('index', $index)
                 ->set('name', $name)
                 ->get();
@@ -248,7 +248,7 @@ protected function createAliasForTargetIndex($name)
             $this->deleteAlias($name);
         }
 
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('index', $targetIndex)
             ->set('name', $name)
             ->get();
@@ -293,7 +293,7 @@ protected function deleteSourceIndex()
             $aliases = $this->getAlias($sourceIndexConfigurator->getName());
 
             foreach ($aliases as $index => $alias) {
-                $payload = (new RawPayload())
+                $payload = (new RawPayload)
                     ->set('index', $index)
                     ->get();
 
diff --git a/src/ElasticEngine.php b/src/ElasticEngine.php
index 626638e..8f0e3b6 100644
--- a/src/ElasticEngine.php
+++ b/src/ElasticEngine.php
@@ -126,7 +126,7 @@ public function buildSearchQueryPayloadCollection(Builder $builder, array $optio
             }
         } else {
             $payload = (new TypePayload($builder->model))
-                ->setIfNotEmpty('body.query.bool.must.match_all', new stdClass());
+                ->setIfNotEmpty('body.query.bool.must.match_all', new stdClass);
 
             $payloadCollection->push($payload);
         }
diff --git a/src/Indexers/BulkIndexer.php b/src/Indexers/BulkIndexer.php
index dbba4ab..279df26 100644
--- a/src/Indexers/BulkIndexer.php
+++ b/src/Indexers/BulkIndexer.php
@@ -42,7 +42,7 @@ public function update(Collection $models)
                 return true;
             }
 
-            $actionPayload = (new RawPayload())
+            $actionPayload = (new RawPayload)
                 ->set('index._id', $model->getScoutKey());
 
             $bulkPayload
@@ -63,7 +63,7 @@ public function delete(Collection $models)
         $bulkPayload = new TypePayload($model);
 
         $models->each(function ($model) use ($bulkPayload) {
-            $actionPayload = (new RawPayload())
+            $actionPayload = (new RawPayload)
                 ->set('delete._id', $model->getScoutKey());
 
             $bulkPayload->add('body', $actionPayload->get());
diff --git a/src/ScoutElasticServiceProvider.php b/src/ScoutElasticServiceProvider.php
index 79141db..ed9be97 100644
--- a/src/ScoutElasticServiceProvider.php
+++ b/src/ScoutElasticServiceProvider.php
@@ -59,7 +59,7 @@ public function boot()
                     ));
                 }
 
-                return new ElasticEngine(new $indexerClass(), $updateMapping);
+                return new ElasticEngine(new $indexerClass, $updateMapping);
             });
     }
 
diff --git a/src/Searchable.php b/src/Searchable.php
index 47020dd..bd5da47 100644
--- a/src/Searchable.php
+++ b/src/Searchable.php
@@ -99,7 +99,7 @@ public static function search($query, $callback = null)
      */
     public static function searchRaw(array $query)
     {
-        $model = new static();
+        $model = new static;
 
         return $model->searchableUsing()
             ->searchRaw($model, $query);
diff --git a/tests/ElasticEngineTest.php b/tests/ElasticEngineTest.php
index a29b445..7be7c4d 100644
--- a/tests/ElasticEngineTest.php
+++ b/tests/ElasticEngineTest.php
@@ -184,7 +184,7 @@ public function testBuildFilterQueryPayloadCollection()
                         'query' => [
                             'bool' => [
                                 'must' => [
-                                    'match_all' => new stdClass(),
+                                    'match_all' => new stdClass,
                                 ],
                                 'filter' => [
                                     'bool' => [
diff --git a/tests/Indexers/BulkIndexerTest.php b/tests/Indexers/BulkIndexerTest.php
index 20caef1..da735d5 100644
--- a/tests/Indexers/BulkIndexerTest.php
+++ b/tests/Indexers/BulkIndexerTest.php
@@ -26,7 +26,7 @@ public function testUpdateWithDisabledSoftDelete()
                 ],
             ]);
 
-        (new BulkIndexer())
+        (new BulkIndexer)
             ->update($this->models);
 
         $this->addToAssertionCount(1);
@@ -52,7 +52,7 @@ public function testUpdateWithEnabledSoftDelete()
                 ],
             ]);
 
-        (new BulkIndexer())
+        (new BulkIndexer)
             ->update($this->models);
 
         $this->addToAssertionCount(1);
@@ -77,7 +77,7 @@ public function testUpdateWithSpecifiedDocumentRefreshOption()
                 ],
             ]);
 
-        (new BulkIndexer())
+        (new BulkIndexer)
             ->update($this->models);
 
         $this->addToAssertionCount(1);
@@ -101,7 +101,7 @@ public function testDelete()
                 ],
             ]);
 
-        (new BulkIndexer())
+        (new BulkIndexer)
             ->delete($this->models);
 
         $this->addToAssertionCount(1);
diff --git a/tests/Indexers/SingleIndexerTest.php b/tests/Indexers/SingleIndexerTest.php
index 01b1964..37755d7 100644
--- a/tests/Indexers/SingleIndexerTest.php
+++ b/tests/Indexers/SingleIndexerTest.php
@@ -34,7 +34,7 @@ public function testUpdateWithDisabledSoftDelete()
                 ],
             ]);
 
-        (new SingleIndexer())
+        (new SingleIndexer)
             ->update($this->models);
 
         $this->addToAssertionCount(1);
@@ -78,7 +78,7 @@ public function testUpdateWithEnabledSoftDelete()
                 ],
             ]);
 
-        (new SingleIndexer())
+        (new SingleIndexer)
             ->update($this->models);
 
         $this->addToAssertionCount(1);
@@ -112,7 +112,7 @@ public function testUpdateWithSpecifiedDocumentRefreshOption()
                 ],
             ]);
 
-        (new SingleIndexer())
+        (new SingleIndexer)
             ->update($this->models);
 
         $this->addToAssertionCount(1);
@@ -152,7 +152,7 @@ public function testDelete()
                 ],
             ]);
 
-        (new SingleIndexer())
+        (new SingleIndexer)
             ->delete($this->models);
 
         $this->addToAssertionCount(1);
diff --git a/tests/Payloads/RawPayloadTest.php b/tests/Payloads/RawPayloadTest.php
index 97331f3..4baf996 100644
--- a/tests/Payloads/RawPayloadTest.php
+++ b/tests/Payloads/RawPayloadTest.php
@@ -9,7 +9,7 @@ class RawPayloadTest extends AbstractTestCase
 {
     public function testSet()
     {
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('foo.bar', 10);
 
         $this->assertSame(
@@ -20,7 +20,7 @@ public function testSet()
 
     public function testSetIfNotEmpty()
     {
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->setIfNotEmpty('null', null)
             ->setIfNotEmpty('false', false)
             ->setIfNotEmpty('zero', 0)
@@ -36,7 +36,7 @@ public function testSetIfNotEmpty()
 
     public function testSetIfNotNull()
     {
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->setIfNotNull('null', null)
             ->setIfNotNull('false', false)
             ->setIfNotNull('zero', 0)
@@ -58,7 +58,7 @@ public function testSetIfNotNull()
 
     public function testHas()
     {
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('foo.bar', 100);
 
         $this->assertTrue($payload->has('foo'));
@@ -68,7 +68,7 @@ public function testHas()
 
     public function testAdd()
     {
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('foo', 0)
             ->add('foo', 1);
 
@@ -80,7 +80,7 @@ public function testAdd()
 
     public function testAddIfNotEmpty()
     {
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->addIfNotEmpty('foo', 0)
             ->addIfNotEmpty('foo', 1);
 
@@ -92,7 +92,7 @@ public function testAddIfNotEmpty()
 
     public function testGet()
     {
-        $payload = (new RawPayload())
+        $payload = (new RawPayload)
             ->set('foo.bar', 0);
 
         $this->assertSame(