diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9251974b8dd47987cf7101639f8be8d8093e561..5f8add9d1a7234d12336d0a83aa682e1ac8ba748 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,14 +48,13 @@ add_subdirectory( Modules )
 # Testing requires CMake version 2.8.11 to download test data
 if( CMAKE_VERSION VERSION_LESS 2.8.11 )
   set( ELASTIX_BUILD_TESTING_DEFAULT OFF )
-  message( STATUS "ELASTIX_BUILD_TESTING is set to OFF by default because CMake version is less than 2.8.11" )
+  message( STATUS "ELASTIX_BUILD_TESTING is set to OFF because CMake version is less than 2.8.11" )
 else()
   set( ELASTIX BUILD_TESTING_DEFAULT ON )
 endif()
 
 option( ELASTIX_BUILD_TESTING "Enable building tests." ${ELASTIX_BUILD_TESTING_DEFAULT} )
-
-if( ELASTIX_BUILD_TESTING )
+if( ${ELASTIX_BUILD_TESTING} )
   enable_testing()
   add_subdirectory( Testing )
 endif()
diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt
index ed8ac28d118442a7668ad4b7d36363991a040500..3c6212d3542a67000d0091ff33a596e2e739a74c 100644
--- a/Modules/CMakeLists.txt
+++ b/Modules/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_subdirectory(
   Core
-)
\ No newline at end of file
+)
diff --git a/Modules/Core/Blueprints/CMakeLists.txt b/Modules/Core/Blueprints/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Modules/Core/CMakeLists.txt b/Modules/Core/CMakeLists.txt
index dac4f7215cdf262d7f6c95cbbf835032a65bd4ce..84c12fcb3aba7189c16706bc6a7affdded2175ca 100644
--- a/Modules/Core/CMakeLists.txt
+++ b/Modules/Core/CMakeLists.txt
@@ -1,4 +1,2 @@
-add_subdirectory(
-  Common
-  Blueprints
-)
\ No newline at end of file
+add_subdirectory( Common )
+add_subdirectory( Blueprints )
diff --git a/Modules/Core/Common/CMakeLists.txt b/Modules/Core/Common/CMakeLists.txt
index fc2d9b4b5d0a3c36a784b891478afd95cc7c4302..b83cfce3b85bc48c4c713194051c1e70655c7a95 100644
--- a/Modules/Core/Common/CMakeLists.txt
+++ b/Modules/Core/Common/CMakeLists.txt
@@ -1 +1 @@
-include_directories( include )
\ No newline at end of file
+include_directories( include )
diff --git a/Modules/Core/Common/include/elxMacro.h b/Modules/Core/Common/include/elxMacro.h
index d176d1a5dce073af5baa7421e4e35628bbfc9504..15f63f9ee33b2af82f4136af788092f07e9e3095 100644
--- a/Modules/Core/Common/include/elxMacro.h
+++ b/Modules/Core/Common/include/elxMacro.h
@@ -2,8 +2,8 @@
 #define __elxMacro_h
 
 /**
- * Register class with the object factory and provide 
- * associated RTTI (Run-Time Type Information)
+ * Register class with the object factory and set RTTI (Run-Time Type 
+ * Information)
  */
 #define elxNewMacro( className, superClassName )        \
   typedef className                       Self;         \