diff --git a/JSON/src/Parser.cpp b/JSON/src/Parser.cpp
index 912603e2a..97ac95e21 100644
--- a/JSON/src/Parser.cpp
+++ b/JSON/src/Parser.cpp
@@ -583,8 +583,8 @@ bool Parser::readRow(bool firstCall)
 
 		token = nextToken();
 
-		if (   token->is(Token::SEPARATOR_TOKEN)
-            && token->asChar() == ':')
+		if (token->is(Token::SEPARATOR_TOKEN)
+		 && token->asChar() == ':')
 		{
 			readValue(nextToken());
 
@@ -638,8 +638,8 @@ void Parser::readValue(const Token* token)
 #if defined(POCO_HAVE_INT64)
 			Int64 value = token->asInteger64();
 			// if number is 32-bit, then handle as such
-			if (   value > std::numeric_limits<int>::max()
-                || value < std::numeric_limits<int>::min())
+			if (value > std::numeric_limits<int>::max()
+			|| value < std::numeric_limits<int>::min())
 			{
 				_handler->value(value);
 			}
diff --git a/JSON/src/Query.cpp b/JSON/src/Query.cpp
index 93cda2248..2b30059bb 100644
--- a/JSON/src/Query.cpp
+++ b/JSON/src/Query.cpp
@@ -122,8 +122,8 @@ Var Query::find(const std::string& path) const
 				}
 			}
 
-			if (    !result.isEmpty()
-			        && !indexes.empty() )
+			if (!result.isEmpty()
+			 && !indexes.empty() )
 			{
 				for(std::vector<int>::iterator it = indexes.begin(); it != indexes.end(); ++it )
 				{
diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp
index f2167e3ee..99b03394a 100644
--- a/JSON/testsuite/src/JSONTest.cpp
+++ b/JSON/testsuite/src/JSONTest.cpp
@@ -200,7 +200,7 @@ void JSONTest::testNumber64Property()
 	std::string json = "{ \"test\" : 5000000000000000 }";
 	Parser parser;
 	Var result;
-    
+
 	try
 	{
 		DefaultHandler handler;
@@ -213,13 +213,13 @@ void JSONTest::testNumber64Property()
 		std::cout << jsone.message() << std::endl;
 		assert(false);
 	}
-    
+
 	assert(result.type() == typeid(Object::Ptr));
-    
+
 	Object::Ptr object = result.extract<Object::Ptr>();
 	Var test = object->get("test");
 	assert(test.isInteger());
-    Poco::Int64 value = test;
+	Poco::Int64 value = test;
 	assert(value == 5000000000000000);
 }