diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53c681cdbc20a94a691cdd82aedb8c4085b39c53..77b791c436b0d8cd0f2a104f8ecf69067978ec65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,14 @@ include_directories(utils)
 include(GetKokkosCompilerFlags)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 
+# ------------------- Source files --------------------
 # Pastis binary
-add_executable(pastis main.cpp)
-target_link_libraries(pastis kokkos PastisUtils)
+add_executable(
+  pastis
+  main.cpp)
+
+# Libraries
+target_link_libraries(
+  pastis
+  kokkos
+  PastisUtils)
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 3311f608c602abcf763570abb2590992722f9df7..73cfdd7bdaccb1cb6ac18c6555a50233817dff00 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,6 +1,14 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
+# ------------------- Source files --------------------
+
+add_library(
+  PastisUtils
+  RevisionInfo.cpp)
+
+# --------------- get git revision info ---------------
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/cmake-modules")
 include(GetGitRevisionDescription)
 
@@ -14,6 +22,7 @@ else()
   set(PASTIS_IS_CLEAN false)
 endif()
 
+# Generates revision header file
 add_custom_target(
   git_revision
   ALL
@@ -28,8 +37,14 @@ set_source_files_properties(
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pastis_git_revision.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/pastis_git_revision.hpp" @ONLY)
 
-list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/pastis_git_revision.hpp)
+list(
+  APPEND
+  SOURCES
+  ${CMAKE_CURRENT_BINARY_DIR}/pastis_git_revision.hpp)
+
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_library(PastisUtils RevisionInfo.cpp)
-add_dependencies(PastisUtils git_revision)
+# Additional dependencies
+add_dependencies(
+  PastisUtils
+  git_revision)