diff --git a/Tests/Unit/EntryQueriesTest.php b/Tests/Unit/EntryQueriesTest.php
index 7feddeba3fc5aab2122291b44c54ba629ab171bc..30f037f2c9aa628a16098cda09636ea0ea021a12 100644
--- a/Tests/Unit/EntryQueriesTest.php
+++ b/Tests/Unit/EntryQueriesTest.php
@@ -3,7 +3,6 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Unit;
 
-
 use calderawp\CalderaFormsQuery\EntryQueries;
 use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
@@ -21,7 +20,7 @@ class EntryQueriesTest extends TestCase
 	public function testGetEntryGenerator()
 	{
 		$queries = $this->entryQueriesFactory();
-		$this->assertTrue( is_a( $queries->getEntryGenerator(), Entry::class) );
+		$this->assertTrue(is_a($queries->getEntryGenerator(), Entry::class));
 	}
 
 	/**
@@ -32,19 +31,17 @@ class EntryQueriesTest extends TestCase
 	 */public function testGetEntryValueGenerator()
 	{
 		$queries = $this->entryQueriesFactory();
-		$this->assertTrue( is_a( $queries->getEntryValueGenerator(), EntryValues::class) );
-	}
+		$this->assertTrue(is_a($queries->getEntryValueGenerator(), EntryValues::class));
+}
 
 	/**
 	 * Test that getResults method returns an array
 	 *
 	 * @covers EntryQueries::getResults()
 	 */
-	public function testGetResults()
-	{
-		$queries = $this->entryQueriesFactory();
-		$this->assertTrue( is_array( $queries->getResults( "SELECT `roy` FROM sivan WHERE mike = 'roy'")));
-		
-	}
-
-}
\ No newline at end of file
+public function testGetResults()
+{
+	$queries = $this->entryQueriesFactory();
+	$this->assertTrue(is_array($queries->getResults("SELECT `roy` FROM sivan WHERE mike = 'roy'")));
+}
+}
diff --git a/Tests/Unit/MySqlBuilderTest.php b/Tests/Unit/MySqlBuilderTest.php
index f557270e50500518ad2245f081bcb8899a43b478..494e46b1999bc833e7c04ba645609ce9c7a84f45 100644
--- a/Tests/Unit/MySqlBuilderTest.php
+++ b/Tests/Unit/MySqlBuilderTest.php
@@ -3,7 +3,6 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Unit;
 
-
 use calderawp\CalderaFormsQuery\MySqlBuilder;
 
 class MySqlBuilderTest extends TestCase
@@ -24,13 +23,12 @@ class MySqlBuilderTest extends TestCase
 
 		$query
 			->where()
-			->equals( 'mike', 'roy')
+			->equals('mike', 'roy')
 		;
 
-		$builder->write( $query );
+		$builder->write($query);
 		$values = $builder->getValues();
-		$this->assertTrue(is_array( $values ) );
-		$this->assertArrayHasKey( '%1s', $values );
-
+		$this->assertTrue(is_array($values));
+		$this->assertArrayHasKey('%1s', $values);
 	}
-}
\ No newline at end of file
+}
diff --git a/Tests/Unit/Select/EntryTest.php b/Tests/Unit/Select/EntryTest.php
index 45a2f3dd0d00d63138673e98a60213c74212e68e..e54c799a1803a18409fd86e2f5599d1de1bdef58 100644
--- a/Tests/Unit/Select/EntryTest.php
+++ b/Tests/Unit/Select/EntryTest.php
@@ -3,7 +3,6 @@
 
 namespace  calderawp\CalderaFormsQuery\Tests\Unit\Select;
 
-
 use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Tests\Unit\TestCase;
 
@@ -19,12 +18,11 @@ class EntryTest extends TestCase
 	{
 		$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`form_id` = 'cf12345')";
 		$entryGenerator = $this->entryGeneratorFactory();
-		$generator = $entryGenerator->queryByFormsId( 'cf12345');
-		$this->assertTrue( $this->isAEntry($generator) );
+		$generator = $entryGenerator->queryByFormsId('cf12345');
+		$this->assertTrue($this->isAEntry($generator));
 
 		$actualSql = $entryGenerator->getPreparedSql();
-		$this->assertEquals( $expectedSql, $actualSql );
-
+		$this->assertEquals($expectedSql, $actualSql);
 	}
 
 	/**
@@ -36,11 +34,11 @@ class EntryTest extends TestCase
 	{
 		$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`id` = '42')";
 		$entryGenerator = $this->entryGeneratorFactory();
-		$generator = $entryGenerator->queryByEntryId( 42);
-		$this->assertTrue( $this->isAEntry($generator) );
+		$generator = $entryGenerator->queryByEntryId(42);
+		$this->assertTrue($this->isAEntry($generator));
 
 		$actualSql = $entryGenerator->getPreparedSql();
-		$this->assertEquals( $expectedSql, $actualSql );
+		$this->assertEquals($expectedSql, $actualSql);
 	}
 
 	/**
@@ -52,11 +50,11 @@ class EntryTest extends TestCase
 	{
 		$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`user_id` = '42')";
 		$entryGenerator = $this->entryGeneratorFactory();
-		$generator = $entryGenerator->queryByUserId( 42);
-		$this->assertTrue( $this->isAEntry($generator) );
+		$generator = $entryGenerator->queryByUserId(42);
+		$this->assertTrue($this->isAEntry($generator));
 
 		$actualSql = $entryGenerator->getPreparedSql();
-		$this->assertEquals( $expectedSql, $actualSql );
+		$this->assertEquals($expectedSql, $actualSql);
 	}
 
 	/**
@@ -67,4 +65,4 @@ class EntryTest extends TestCase
 	{
 		return is_a($generator, '\calderawp\CalderaFormsQuery\Select\Entry');
 	}
-}
\ No newline at end of file
+}
diff --git a/Tests/Unit/Select/EntryValuesTest.php b/Tests/Unit/Select/EntryValuesTest.php
index ff0e9a6289a961bfa1224639a7939e753eda2863..87f735b5c3ab2a99fe711bb8c2e43405acee6827 100644
--- a/Tests/Unit/Select/EntryValuesTest.php
+++ b/Tests/Unit/Select/EntryValuesTest.php
@@ -18,11 +18,11 @@ class EntryValuesTest extends TestCase
 		$expectedSql = "SELECT `cf_form_entry_values`.* FROM `cf_form_entry_values` WHERE (`cf_form_entry_values`.`value` = 'josh@calderawp.com') AND (`cf_form_entry_values`.`slug` = 'email_address')";
 
 		$entryValues = $this->entryValuesGeneratorFactory();
-		$generator = $entryValues->queryByFieldValue( 'email_address', 'josh@calderawp.com' );
+		$generator = $entryValues->queryByFieldValue('email_address', 'josh@calderawp.com');
 		$this->assertTrue($this->isAEntryValues($generator));
 
 		$actualSql = $entryValues->getPreparedSql();
-		$this->assertEquals( $expectedSql, $actualSql );
+		$this->assertEquals($expectedSql, $actualSql);
 	}
 
 	/**
@@ -34,11 +34,11 @@ class EntryValuesTest extends TestCase
 	{
 		$expectedSql = "SELECT `cf_form_entry_values`.* FROM `cf_form_entry_values` WHERE (`cf_form_entry_values`.`value` <> 'josh@calderawp.com') AND (`cf_form_entry_values`.`slug` = 'email_address')";
 		$entryValues = $this->entryValuesGeneratorFactory();
-		$generator =$entryValues->queryByFieldValue( 'email_address', 'josh@calderawp.com','notEquals' );
+		$generator =$entryValues->queryByFieldValue('email_address', 'josh@calderawp.com', 'notEquals');
 		$this->assertTrue($this->isAEntryValues($generator));
 
 		$actualSql = $entryValues->getPreparedSql();
-		$this->assertEquals( $expectedSql, $actualSql );
+		$this->assertEquals($expectedSql, $actualSql);
 	}
 
 	/**
@@ -52,11 +52,11 @@ class EntryValuesTest extends TestCase
 		$expectedSql = "SELECT `cf_form_entry_values`.* FROM `cf_form_entry_values` WHERE (`cf_form_entry_values`.`value` LIKE %josh@calderawp.com%)";
 		
 		$entryValues = $this->entryValuesGeneratorFactory();
-		$generator = $entryValues->queryByFieldValue( 'email_address', 'josh@calderawp.com','like' );
+		$generator = $entryValues->queryByFieldValue('email_address', 'josh@calderawp.com', 'like');
 		$this->assertTrue($this->isAEntryValues($generator));
 
 		$actualSql = $entryValues->getPreparedSql();
-		$this->assertEquals( $expectedSql, $actualSql );
+		$this->assertEquals($expectedSql, $actualSql);
 	}
 
 	/**
@@ -68,11 +68,11 @@ class EntryValuesTest extends TestCase
 	{
 		$expectedSql = "SELECT `cf_form_entry_values`.* FROM `cf_form_entry_values` WHERE (`cf_form_entry_values`.`entry_id` = '42')";
 		$entryValues = $this->entryValuesGeneratorFactory();
-		$generator = $entryValues->queryByEntryId( 42 );
+		$generator = $entryValues->queryByEntryId(42);
 		$this->assertTrue($this->isAEntryValues($generator));
 
 		$actualSql = $entryValues->getPreparedSql();
-		$this->assertEquals( $expectedSql, $actualSql );
+		$this->assertEquals($expectedSql, $actualSql);
 	}
 
 	/**
@@ -83,5 +83,4 @@ class EntryValuesTest extends TestCase
 	{
 		return is_a($generator, '\calderawp\CalderaFormsQuery\Select\EntryValues');
 	}
-
-}
\ No newline at end of file
+}
diff --git a/Tests/Unit/Select/SelectQueryBuilderTest.php b/Tests/Unit/Select/SelectQueryBuilderTest.php
index 8134749c96277506e218200b698b52ba655197e7..78dac1e12067b6d7742b915a46061fd19379e5b2 100644
--- a/Tests/Unit/Select/SelectQueryBuilderTest.php
+++ b/Tests/Unit/Select/SelectQueryBuilderTest.php
@@ -3,7 +3,6 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Unit\Select;
 
-
 use calderawp\CalderaFormsQuery\MySqlBuilder;
 use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
@@ -23,10 +22,10 @@ class SelectQueryBuilderTest extends TestCase
 	public function testGetTableName()
 	{
 		$entry = $this->entryGeneratorFactory();
-		$this->assertEquals( 'wp_cf_form_entries', $entry->getTableName() );
+		$this->assertEquals('wp_cf_form_entries', $entry->getTableName());
 
 		$entryValues = $this->entryValuesGeneratorFactory();
-		$this->assertSame( 'cf_form_entry_values', $entryValues->getTableName() );
+		$this->assertSame('cf_form_entry_values', $entryValues->getTableName());
 	}
 
 	/**
@@ -38,10 +37,10 @@ class SelectQueryBuilderTest extends TestCase
 	public function testGetBuilder()
 	{
 		$entry = $this->entryGeneratorFactory();
-		$this->assertTrue( is_a( $entry->getBuilder(), MySqlBuilder::class ) );
+		$this->assertTrue(is_a($entry->getBuilder(), MySqlBuilder::class));
 
 		$entryValues = $this->entryValuesGeneratorFactory();
-		$this->assertTrue( is_a( $entryValues->getBuilder(), MySqlBuilder::class ) );
+		$this->assertTrue(is_a($entryValues->getBuilder(), MySqlBuilder::class));
 	}
 
 	/**
@@ -53,10 +52,10 @@ class SelectQueryBuilderTest extends TestCase
 	public function testGetSelectQuery()
 	{
 		$entry = $this->entryGeneratorFactory();
-		$this->assertTrue( is_a( $entry->getSelectQuery(), Select::class ) );
+		$this->assertTrue(is_a($entry->getSelectQuery(), Select::class));
 
 		$entryValues = $this->entryValuesGeneratorFactory();
-		$this->assertTrue( is_a( $entryValues->getSelectQuery(), Select::class ) );
+		$this->assertTrue(is_a($entryValues->getSelectQuery(), Select::class));
 	}
 
 	/**
@@ -68,10 +67,10 @@ class SelectQueryBuilderTest extends TestCase
 	{
 		$entry = $this->entryGeneratorFactory();
 		$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`form_id` = 'cf12345') ORDER BY `wp_cf_form_entries`.`form_id` DESC";
-		$entry->queryByFormsId( 'cf12345' );
-		$entry->addOrderBy( 'form_id', false );
+		$entry->queryByFormsId('cf12345');
+		$entry->addOrderBy('form_id', false);
 		$actualSql = $entry->getPreparedSql();
-		$this->assertEquals( $expectedSql, $actualSql );
+		$this->assertEquals($expectedSql, $actualSql);
 	}
 
 	/**
@@ -83,10 +82,10 @@ class SelectQueryBuilderTest extends TestCase
 	{
 		$entry = $this->entryGeneratorFactory();
 		$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`form_id` = 'cf12345') ORDER BY `wp_cf_form_entries`.`form_id` ASC";
-		$entry->queryByFormsId( 'cf12345' );
-		$entry->addOrderBy( 'form_id' );
+		$entry->queryByFormsId('cf12345');
+		$entry->addOrderBy('form_id');
 		$actualSql = $entry->getPreparedSql();
-		$this->assertEquals( $expectedSql, $actualSql );
+		$this->assertEquals($expectedSql, $actualSql);
 	}
 
 	/**
@@ -96,8 +95,8 @@ class SelectQueryBuilderTest extends TestCase
 	 */
 	public function testAscConstant()
 	{
-		$this->assertEquals( Entry::ASC, 'ASC' );
-		$this->assertEquals( EntryValues::ASC, 'ASC' );
+		$this->assertEquals(Entry::ASC, 'ASC');
+		$this->assertEquals(EntryValues::ASC, 'ASC');
 	}
 
 	/**
@@ -107,7 +106,7 @@ class SelectQueryBuilderTest extends TestCase
 	 */
 	public function testDescConstant()
 	{
-		$this->assertEquals( Entry::DESC, 'DESC' );
-		$this->assertEquals( EntryValues::DESC, 'DESC' );
+		$this->assertEquals(Entry::DESC, 'DESC');
+		$this->assertEquals(EntryValues::DESC, 'DESC');
 	}
-}
\ No newline at end of file
+}
diff --git a/src/DoesQueries.php b/src/DoesQueries.php
index b3a6c75bf19c3850dae8870e7a17d7306f808f5b..858870f0915e892fdac3f25f848d05668eeda232 100644
--- a/src/DoesQueries.php
+++ b/src/DoesQueries.php
@@ -3,7 +3,6 @@
 
 namespace calderawp\CalderaFormsQuery;
 
-
 interface DoesQueries
 {
 
@@ -27,5 +26,4 @@ interface DoesQueries
 	 * @return MySqlBuilder
 	 */
 	public function getBuilder();
-
-}
\ No newline at end of file
+}
diff --git a/src/EntryQueries.php b/src/EntryQueries.php
index 3dc1212cbcf95e53c4689f3cf25422d93f56807c..8bf04f7672ec257f7db9eb4192beea7d3f9c2e1e 100644
--- a/src/EntryQueries.php
+++ b/src/EntryQueries.php
@@ -3,9 +3,6 @@
 
 namespace calderawp\CalderaFormsQuery;
 
-
-
-
 use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
 
@@ -31,7 +28,7 @@ class EntryQueries implements QueriesEntries
 	 */
 	protected $wpdb;
 
-	public function __construct( Entry $entryGenerator, EntryValues $entryValueGenerator, \wpdb $wpdb )
+	public function __construct(Entry $entryGenerator, EntryValues $entryValueGenerator, \wpdb $wpdb)
 	{
 		$this->entryGenerator = $entryGenerator;
 		$this->entryValueGenerator = $entryValueGenerator;
@@ -39,10 +36,10 @@ class EntryQueries implements QueriesEntries
 	}
 
 	/** @inheritdoc */
-	public function getResults( $sql )
+	public function getResults($sql)
 	{
-		$results = $this->wpdb->get_results( $sql );
-		if( empty( $results ) ){
+		$results = $this->wpdb->get_results($sql);
+		if (empty($results)) {
 			return [];
 		}
 		return $results;
@@ -59,5 +56,4 @@ class EntryQueries implements QueriesEntries
 	{
 		return $this->entryGenerator;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/MySqlBuilder.php b/src/MySqlBuilder.php
index 3f775ab9d2ce8327dfb316587afac73c9f16b658..8bb749ec63a65f099024847f5e6910bafa342391 100644
--- a/src/MySqlBuilder.php
+++ b/src/MySqlBuilder.php
@@ -3,7 +3,6 @@
 
 namespace calderawp\CalderaFormsQuery;
 
-
 use NilPortugues\Sql\QueryBuilder\Builder\Syntax\PlaceholderWriter;
 
 class MySqlBuilder extends \NilPortugues\Sql\QueryBuilder\Builder\MySqlBuilder
@@ -20,13 +19,11 @@ class MySqlBuilder extends \NilPortugues\Sql\QueryBuilder\Builder\MySqlBuilder
 	 *
 	 * @param PlaceholderWriter|null $writer
 	 */
-	public function setPlaceHolderWriter( PlaceholderWriter $writer = null )
+	public function setPlaceHolderWriter(PlaceholderWriter $writer = null)
 	{
-		if( $writer ){
+		if ($writer) {
 			$this->placeholderWriter = $writer;
 		}
 		$this->placeholderWriter = new SprintfPlaceHolderWriter();
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/QueriesEntries.php b/src/QueriesEntries.php
index 8af5ce50ef96cff1b277bd54b3551c87ae0a9bfb..4b173f6cecce697417e714995a0e2985cf8ceba0 100644
--- a/src/QueriesEntries.php
+++ b/src/QueriesEntries.php
@@ -3,7 +3,6 @@
 
 namespace calderawp\CalderaFormsQuery;
 
-
 use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
 
@@ -26,6 +25,5 @@ interface QueriesEntries
 	 * @param $sql
 	 * @return \stdClass[]
 	 */
-	public function getResults( $sql );
-
-}
\ No newline at end of file
+	public function getResults($sql);
+}
diff --git a/src/Select/DoesSelectQuery.php b/src/Select/DoesSelectQuery.php
index 7bfbf4577e65c20b803f321c257406994d1fcd86..4b8b929abb11dd1839be14e1fc680ee64eca1a3e 100644
--- a/src/Select/DoesSelectQuery.php
+++ b/src/Select/DoesSelectQuery.php
@@ -3,7 +3,6 @@
 
 namespace calderawp\CalderaFormsQuery\Select;
 
-
 use NilPortugues\Sql\QueryBuilder\Manipulation\Select;
 
 interface DoesSelectQuery
@@ -15,4 +14,4 @@ interface DoesSelectQuery
 	 * @return Select
 	 */
 	public function getSelectQuery();
-}
\ No newline at end of file
+}
diff --git a/src/Select/Entry.php b/src/Select/Entry.php
index 8b6c83b1e9cec79cd071561e812537c9eb127793..49b4027428d72128a0067eadc0502dd9be5c62d5 100644
--- a/src/Select/Entry.php
+++ b/src/Select/Entry.php
@@ -25,17 +25,16 @@ class Entry extends SelectQueryBuilder
 	 */
 	public function queryByFormsId($formId)
 	{
-		return $this->is( 'form_id', $formId );
+		return $this->is('form_id', $formId);
 	}
 
 	public function queryByEntryId($entryId)
 	{
-		return $this->is( 'id', $entryId );
+		return $this->is('id', $entryId);
 	}
 
 	public function queryByUserId($userId)
 	{
-		return $this->is( 'user_id', $userId );
+		return $this->is('user_id', $userId);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Select/EntryValues.php b/src/Select/EntryValues.php
index e0e75f88bd68207ecf6856a33126f3fad48f3701..d46d3cec3b7d1c8fead52233f2d50adb1e37df1f 100644
--- a/src/Select/EntryValues.php
+++ b/src/Select/EntryValues.php
@@ -3,7 +3,6 @@
 
 namespace calderawp\CalderaFormsQuery\Select;
 
-
 class EntryValues extends SelectQueryBuilder
 {
 
@@ -14,12 +13,12 @@ class EntryValues extends SelectQueryBuilder
 	 * @param $entryId
 	 * @return $this
 	 */
-	public function queryByEntryId( $entryId )
+	public function queryByEntryId($entryId)
 	{
 		 $this
 			->getSelectQuery()
 			->where()
-			->equals('entry_id', $entryId )
+			->equals('entry_id', $entryId)
 			;
 		 return $this;
 	}
@@ -33,29 +32,28 @@ class EntryValues extends SelectQueryBuilder
 	 * @param string $whereOperator Optional. Type of where. Default is 'AND'. Any valid MySQL where operator is accepted
 	 * @return $this
 	 */
-	public function queryByFieldValue( $fieldSlug, $fieldValue, $type = 'equals', $whereOperator = 'AND' )
+	public function queryByFieldValue($fieldSlug, $fieldValue, $type = 'equals', $whereOperator = 'AND')
 	{
-		switch ( $type ){
+		switch ($type) {
 			case 'equals':
 				$this
 					->getSelectQuery()
-					->where($whereOperator )
-					->equals('value', $fieldValue )
+					->where($whereOperator)
+					->equals('value', $fieldValue)
 				;
 				break;
 			case 'notEquals':
 				$this->
 				getSelectQuery()
-					->where( $whereOperator )
-					->notEquals( 'value', $fieldValue );
+					->where($whereOperator)
+					->notEquals('value', $fieldValue);
 				break;
 			case 'like':
 				$this->
 				getSelectQuery()
-					->where( $whereOperator )
-					->like( 'value', $fieldValue );
+					->where($whereOperator)
+					->like('value', $fieldValue);
 				break;
-
 		}
 
 		$this->isLike = 'like' === $type ? true : false;
@@ -66,5 +64,4 @@ class EntryValues extends SelectQueryBuilder
 
 		return $this;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Select/SelectQueryBuilder.php b/src/Select/SelectQueryBuilder.php
index 493e9016150c668f0d409b7bafa84f87d904c42d..d76d098496196e543dcf0cbeed495ff13aba7bd8 100644
--- a/src/Select/SelectQueryBuilder.php
+++ b/src/Select/SelectQueryBuilder.php
@@ -2,6 +2,7 @@
 
 
 namespace calderawp\CalderaFormsQuery\Select;
+
 use calderawp\CalderaFormsQuery\DoesQueries;
 use calderawp\CalderaFormsQuery\MySqlBuilder;
 use NilPortugues\Sql\QueryBuilder\Manipulation\Select;
@@ -29,7 +30,7 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
 	/**
 	 * @var string
 	 */
-	private  $tableName;
+	private $tableName;
 
 
 	/**
@@ -37,7 +38,7 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
 	 * @param MySqlBuilder $builder Query builder
 	 * @param string $tableName Name of table
 	 */
-	public function __construct( MySqlBuilder $builder, $tableName )
+	public function __construct(MySqlBuilder $builder, $tableName)
 	{
 		$this->builder = $builder;
 		$this->tableName = $tableName;
@@ -57,18 +58,19 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
 
 
 	/** @inheritdoc */
-	public function getSelectQuery(){
+	public function getSelectQuery()
+	{
 
 		if (empty($this->query)) {
 			$this->query = new \NilPortugues\Sql\QueryBuilder\Manipulation\Select($this->getTableName());
-
 		}
 		return $this->query;
 	}
 
 	/** @inheritdoc */
-	public function getPreparedSql(){
-		return $this->substituteValues( $this->getBuilder()->write( $this->getSelectQuery() ));
+	public function getPreparedSql()
+	{
+		return $this->substituteValues($this->getBuilder()->write($this->getSelectQuery()));
 	}
 
 	/**
@@ -76,9 +78,10 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
 	 * @param bool $ascending Optional. To use ascending order? If false, descending is used. True is the default.
 	 * @return $this
 	 */
-	public function addOrderBy( $column, $ascending = true ){
+	public function addOrderBy($column, $ascending = true)
+	{
 		$order = $ascending ? self::ASC : self::DESC;
-		$this->getSelectQuery()->orderBy( $column, $order );
+		$this->getSelectQuery()->orderBy($column, $order);
 		return $this;
 	}
 
@@ -89,11 +92,11 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
 	 * @param string $value
 	 * @return $this
 	 */
-	protected function is($column, $value )
+	protected function is($column, $value)
 	{
 		$this->getSelectQuery()
 			->where()
-			->equals( $column, $value );
+			->equals($column, $value);
 		return $this;
 	}
 
@@ -104,13 +107,13 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
 	 * @param string $sql SQL query with substitutions
 	 * @return string
 	 */
-	protected function substituteValues( $sql )
+	protected function substituteValues($sql)
 	{
 		$values = $this->builder->getValues();
-		foreach ( $values as $identifier => $value ) {
-			$values[ $identifier ] = $this->surroundValue( $value );
+		foreach ($values as $identifier => $value) {
+			$values[$identifier] = $this->surroundValue($value);
 		}
-		return str_replace( array_keys( $values ), array_values( $values ), $sql ) ;
+		return str_replace(array_keys($values), array_values($values), $sql);
 	}
 
 	/**
@@ -127,11 +130,8 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
 	 * @param string $value Value to surround
 	 * @return string
 	 */
-	protected function surroundValue( $value ){
+	protected function surroundValue($value)
+	{
 		return "{$this->getDeliminator()}$value{$this->getDeliminator()}";
 	}
-
-
-
-
-}
\ No newline at end of file
+}
diff --git a/src/SprintfPlaceHolderWriter.php b/src/SprintfPlaceHolderWriter.php
index ab144834218122fcddf57905dafd82332c545b96..053f26425a8ad618f9383d574c50a7cc7749713c 100644
--- a/src/SprintfPlaceHolderWriter.php
+++ b/src/SprintfPlaceHolderWriter.php
@@ -18,4 +18,4 @@ class SprintfPlaceHolderWriter extends PlaceholderWriter
 
 		return $placeholderKey;
 	}
-}
\ No newline at end of file
+}