diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a03b3cee..90329e2a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,23 +95,23 @@ if(USING_TI)
 endif()
 
 # Status messages
-message(STATUS "CMAKE_BUILD_TYPE          " ${CMAKE_BUILD_TYPE})
-message(STATUS "CMAKE_SYSTEM_NAME         " ${CMAKE_SYSTEM_NAME})
-message(STATUS "CMAKE_SYSTEM_PROCESSOR    " ${CMAKE_SYSTEM_PROCESSOR})
-message(STATUS "ENABLE_ALL_IN_ONE         " ${ENABLE_ALL_IN_ONE} ${ENABLE_ALL_IN_ONE_MESSAGE})
-message(STATUS "ENABLE_LTO                " ${ENABLE_LTO} ${ENABLE_LTO_MESSAGE})
-message(STATUS "ENABLE_STATIC_LINK        " ${ENABLE_STATIC_LINK} ${ENABLE_STATIC_LINK_MESSAGE})
-message(STATUS "ENABLE_STRIP              " ${ENABLE_STRIP} ${ENABLE_STRIP_MESSAGE})
-message(STATUS "JERRY_CMDLINE             " ${JERRY_CMDLINE})
-message(STATUS "JERRY_CMDLINE_TEST        " ${JERRY_CMDLINE_TEST})
-message(STATUS "JERRY_CMDLINE_SNAPSHOT    " ${JERRY_CMDLINE_SNAPSHOT})
-message(STATUS "JERRY_PORT_DEFAULT        " ${JERRY_PORT_DEFAULT} ${JERRY_PORT_DEFAULT_MESSAGE})
-message(STATUS "JERRY_EXT                 " ${JERRY_EXT} ${JERRY_EXT_MESSAGE})
-message(STATUS "JERRY_LIBC                " ${JERRY_LIBC} ${JERRY_LIBC_MESSAGE})
-message(STATUS "JERRY_LIBM                " ${JERRY_LIBM} ${JERRY_LIBM_MESSAGE})
-message(STATUS "UNITTESTS                 " ${UNITTESTS})
-message(STATUS "DOCTESTS                  " ${DOCTESTS})
-message(STATUS "FEATURE_INIT_FINI         " ${FEATURE_INIT_FINI})
+message(STATUS "CMAKE_BUILD_TYPE            " ${CMAKE_BUILD_TYPE})
+message(STATUS "CMAKE_SYSTEM_NAME           " ${CMAKE_SYSTEM_NAME})
+message(STATUS "CMAKE_SYSTEM_PROCESSOR      " ${CMAKE_SYSTEM_PROCESSOR})
+message(STATUS "ENABLE_ALL_IN_ONE           " ${ENABLE_ALL_IN_ONE} ${ENABLE_ALL_IN_ONE_MESSAGE})
+message(STATUS "ENABLE_LTO                  " ${ENABLE_LTO} ${ENABLE_LTO_MESSAGE})
+message(STATUS "ENABLE_STATIC_LINK          " ${ENABLE_STATIC_LINK} ${ENABLE_STATIC_LINK_MESSAGE})
+message(STATUS "ENABLE_STRIP                " ${ENABLE_STRIP} ${ENABLE_STRIP_MESSAGE})
+message(STATUS "JERRY_CMDLINE               " ${JERRY_CMDLINE})
+message(STATUS "JERRY_CMDLINE_TEST          " ${JERRY_CMDLINE_TEST})
+message(STATUS "JERRY_CMDLINE_SNAPSHOT      " ${JERRY_CMDLINE_SNAPSHOT})
+message(STATUS "JERRY_PORT_DEFAULT          " ${JERRY_PORT_DEFAULT} ${JERRY_PORT_DEFAULT_MESSAGE})
+message(STATUS "JERRY_EXT                   " ${JERRY_EXT} ${JERRY_EXT_MESSAGE})
+message(STATUS "JERRY_LIBC                  " ${JERRY_LIBC} ${JERRY_LIBC_MESSAGE})
+message(STATUS "JERRY_LIBM                  " ${JERRY_LIBM} ${JERRY_LIBM_MESSAGE})
+message(STATUS "UNITTESTS                   " ${UNITTESTS})
+message(STATUS "DOCTESTS                    " ${DOCTESTS})
+message(STATUS "FEATURE_INIT_FINI           " ${FEATURE_INIT_FINI})
 
 # Setup directories
 # Project binary dir
diff --git a/jerry-main/CMakeLists.txt b/jerry-main/CMakeLists.txt
index f7dcfc759..ed1d73f33 100644
--- a/jerry-main/CMakeLists.txt
+++ b/jerry-main/CMakeLists.txt
@@ -19,7 +19,7 @@ project (jerry-main C)
 set(ENABLE_LINK_MAP OFF CACHE BOOL "Enable generating a link map file?")
 
 # Status messages
-message(STATUS "ENABLE_LINK_MAP           " ${ENABLE_LINK_MAP})
+message(STATUS "ENABLE_LINK_MAP             " ${ENABLE_LINK_MAP})
 
 # Generate map file
 if(ENABLE_LINK_MAP)
diff --git a/jerry-main/benchmarking.c b/jerry-main/benchmarking.c
index 0e8e151a7..28546566b 100644
--- a/jerry-main/benchmarking.c
+++ b/jerry-main/benchmarking.c
@@ -21,7 +21,7 @@
  * implementations.
  */
 
- #ifdef __GNUC__
+#ifdef __GNUC__
 /*
  * Note:
  *      This is nasty and dangerous. However, we only need the timeval structure