diff --git a/src/script/script.h b/src/script/script.h
index e2a1aa96f..e67119197 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -228,12 +228,12 @@ public:
         m_value = set_vch(vch);
     }
 
-    inline bool operator==(const int64_t& rhs) const    { return m_value == rhs; }
-    inline bool operator!=(const int64_t& rhs) const    { return m_value != rhs; }
-    inline bool operator<=(const int64_t& rhs) const    { return m_value <= rhs; }
-    inline bool operator< (const int64_t& rhs) const    { return m_value <  rhs; }
-    inline bool operator>=(const int64_t& rhs) const    { return m_value >= rhs; }
-    inline bool operator> (const int64_t& rhs) const    { return m_value >  rhs; }
+    inline bool operator==(const int64_t& rhs)    const { return m_value == rhs; }
+    inline bool operator!=(const int64_t& rhs)    const { return m_value != rhs; }
+    inline bool operator<=(const int64_t& rhs)    const { return m_value <= rhs; }
+    inline bool operator< (const int64_t& rhs)    const { return m_value <  rhs; }
+    inline bool operator>=(const int64_t& rhs)    const { return m_value >= rhs; }
+    inline bool operator> (const int64_t& rhs)    const { return m_value >  rhs; }
 
     inline bool operator==(const CScriptNum& rhs) const { return operator==(rhs.m_value); }
     inline bool operator!=(const CScriptNum& rhs) const { return operator!=(rhs.m_value); }
@@ -268,7 +268,7 @@ public:
         return CScriptNum(-m_value);
     }
 
-    inline CScriptNum& operator=( const int64_t& rhs)
+    inline CScriptNum& operator=(  const int64_t& rhs)
     {
         m_value = rhs;
         return *this;
diff --git a/src/test/scriptnum10.h b/src/test/scriptnum10.h
index 0b76206a5..d81e599bd 100644
--- a/src/test/scriptnum10.h
+++ b/src/test/scriptnum10.h
@@ -61,12 +61,12 @@ public:
         m_value = set_vch(vch);
     }
 
-    inline bool operator==(const int64_t& rhs) const    { return m_value == rhs; }
-    inline bool operator!=(const int64_t& rhs) const    { return m_value != rhs; }
-    inline bool operator<=(const int64_t& rhs) const    { return m_value <= rhs; }
-    inline bool operator< (const int64_t& rhs) const    { return m_value <  rhs; }
-    inline bool operator>=(const int64_t& rhs) const    { return m_value >= rhs; }
-    inline bool operator> (const int64_t& rhs) const    { return m_value >  rhs; }
+    inline bool operator==(const int64_t& rhs)      const { return m_value == rhs; }
+    inline bool operator!=(const int64_t& rhs)      const { return m_value != rhs; }
+    inline bool operator<=(const int64_t& rhs)      const { return m_value <= rhs; }
+    inline bool operator< (const int64_t& rhs)      const { return m_value <  rhs; }
+    inline bool operator>=(const int64_t& rhs)      const { return m_value >= rhs; }
+    inline bool operator> (const int64_t& rhs)      const { return m_value >  rhs; }
 
     inline bool operator==(const CScriptNum10& rhs) const { return operator==(rhs.m_value); }
     inline bool operator!=(const CScriptNum10& rhs) const { return operator!=(rhs.m_value); }
@@ -95,13 +95,13 @@ public:
     inline CScriptNum10& operator+=( const CScriptNum10& rhs)       { return operator+=(rhs.m_value);  }
     inline CScriptNum10& operator-=( const CScriptNum10& rhs)       { return operator-=(rhs.m_value);  }
 
-    inline CScriptNum10 operator-()                         const
+    inline CScriptNum10 operator-()                           const
     {
         assert(m_value != std::numeric_limits<int64_t>::min());
         return CScriptNum10(-m_value);
     }
 
-    inline CScriptNum10& operator=( const int64_t& rhs)
+    inline CScriptNum10& operator=(  const int64_t& rhs)
     {
         m_value = rhs;
         return *this;
diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp
index e2010438d..42ab48516 100644
--- a/src/test/scriptnum_tests.cpp
+++ b/src/test/scriptnum_tests.cpp
@@ -121,32 +121,32 @@ static void CheckCompare(int64_t num1, int64_t num2)
     const CScriptNum scriptnum2(num2);
 
     BOOST_CHECK((bignum1 == bignum1) == (scriptnum1 == scriptnum1));
-    BOOST_CHECK((bignum1 != bignum1) ==  (scriptnum1 != scriptnum1));
-    BOOST_CHECK((bignum1 < bignum1) ==  (scriptnum1 < scriptnum1));
-    BOOST_CHECK((bignum1 > bignum1) ==  (scriptnum1 > scriptnum1));
-    BOOST_CHECK((bignum1 >= bignum1) ==  (scriptnum1 >= scriptnum1));
-    BOOST_CHECK((bignum1 <= bignum1) ==  (scriptnum1 <= scriptnum1));
+    BOOST_CHECK((bignum1 != bignum1) == (scriptnum1 != scriptnum1));
+    BOOST_CHECK((bignum1 <  bignum1) == (scriptnum1 <  scriptnum1));
+    BOOST_CHECK((bignum1 >  bignum1) == (scriptnum1 >  scriptnum1));
+    BOOST_CHECK((bignum1 >= bignum1) == (scriptnum1 >= scriptnum1));
+    BOOST_CHECK((bignum1 <= bignum1) == (scriptnum1 <= scriptnum1));
 
     BOOST_CHECK((bignum1 == bignum1) == (scriptnum1 == num1));
-    BOOST_CHECK((bignum1 != bignum1) ==  (scriptnum1 != num1));
-    BOOST_CHECK((bignum1 < bignum1) ==  (scriptnum1 < num1));
-    BOOST_CHECK((bignum1 > bignum1) ==  (scriptnum1 > num1));
-    BOOST_CHECK((bignum1 >= bignum1) ==  (scriptnum1 >= num1));
-    BOOST_CHECK((bignum1 <= bignum1) ==  (scriptnum1 <= num1));
+    BOOST_CHECK((bignum1 != bignum1) == (scriptnum1 != num1));
+    BOOST_CHECK((bignum1 <  bignum1) == (scriptnum1 <  num1));
+    BOOST_CHECK((bignum1 >  bignum1) == (scriptnum1 >  num1));
+    BOOST_CHECK((bignum1 >= bignum1) == (scriptnum1 >= num1));
+    BOOST_CHECK((bignum1 <= bignum1) == (scriptnum1 <= num1));
 
-    BOOST_CHECK((bignum1 == bignum2) ==  (scriptnum1 == scriptnum2));
-    BOOST_CHECK((bignum1 != bignum2) ==  (scriptnum1 != scriptnum2));
-    BOOST_CHECK((bignum1 < bignum2) ==  (scriptnum1 < scriptnum2));
-    BOOST_CHECK((bignum1 > bignum2) ==  (scriptnum1 > scriptnum2));
-    BOOST_CHECK((bignum1 >= bignum2) ==  (scriptnum1 >= scriptnum2));
-    BOOST_CHECK((bignum1 <= bignum2) ==  (scriptnum1 <= scriptnum2));
+    BOOST_CHECK((bignum1 == bignum2) == (scriptnum1 == scriptnum2));
+    BOOST_CHECK((bignum1 != bignum2) == (scriptnum1 != scriptnum2));
+    BOOST_CHECK((bignum1 <  bignum2) == (scriptnum1 <  scriptnum2));
+    BOOST_CHECK((bignum1 >  bignum2) == (scriptnum1 >  scriptnum2));
+    BOOST_CHECK((bignum1 >= bignum2) == (scriptnum1 >= scriptnum2));
+    BOOST_CHECK((bignum1 <= bignum2) == (scriptnum1 <= scriptnum2));
 
-    BOOST_CHECK((bignum1 == bignum2) ==  (scriptnum1 == num2));
-    BOOST_CHECK((bignum1 != bignum2) ==  (scriptnum1 != num2));
-    BOOST_CHECK((bignum1 < bignum2) ==  (scriptnum1 < num2));
-    BOOST_CHECK((bignum1 > bignum2) ==  (scriptnum1 > num2));
-    BOOST_CHECK((bignum1 >= bignum2) ==  (scriptnum1 >= num2));
-    BOOST_CHECK((bignum1 <= bignum2) ==  (scriptnum1 <= num2));
+    BOOST_CHECK((bignum1 == bignum2) == (scriptnum1 == num2));
+    BOOST_CHECK((bignum1 != bignum2) == (scriptnum1 != num2));
+    BOOST_CHECK((bignum1 < bignum2)  == (scriptnum1 < num2));
+    BOOST_CHECK((bignum1 > bignum2)  == (scriptnum1 > num2));
+    BOOST_CHECK((bignum1 >= bignum2) == (scriptnum1 >= num2));
+    BOOST_CHECK((bignum1 <= bignum2) == (scriptnum1 <= num2));
 }
 
 static void RunCreate(int64_t num)
@@ -154,10 +154,10 @@ static void RunCreate(int64_t num)
     CheckCreateInt(num);
     CScriptNum scriptnum(num);
     if (scriptnum.getvch().size() <= CScriptNum::nDefaultMaxNumSize)
-        CheckCreateVch(num);
-    else
     {
-        BOOST_CHECK_THROW (CheckCreateVch(num), scriptnum10_error);
+        CheckCreateVch(num);
+    } else {
+        BOOST_CHECK_THROW(CheckCreateVch(num), scriptnum10_error);
     }
 }
 
@@ -171,9 +171,9 @@ static void RunOperators(int64_t num1, int64_t num2)
 
 BOOST_AUTO_TEST_CASE(creation)
 {
-    for(size_t i = 0; i < sizeof(values) / sizeof(values[0]); ++i)
+    for (size_t i = 0; i < sizeof(values) / sizeof(values[0]); ++i)
     {
-        for(size_t j = 0; j < sizeof(offsets) / sizeof(offsets[0]); ++j)
+        for (size_t j = 0; j < sizeof(offsets) / sizeof(offsets[0]); ++j)
         {
             if (value_in_range(values[i])) {
                 RunCreate(values[i]);
@@ -190,7 +190,7 @@ BOOST_AUTO_TEST_CASE(creation)
 
 BOOST_AUTO_TEST_CASE(operators)
 {
-    for(size_t i = 0; i < sizeof(values) / sizeof(values[0]); ++i)
+    for (size_t i = 0; i < sizeof(values) / sizeof(values[0]); ++i)
     {
         for (size_t j = 0; j < sizeof(values) / sizeof(values[0]); ++j)
         {