diff --git a/analysis/common/at_kfpf_interface/CMakeLists.txt b/analysis/common/at_kfpf_interface/CMakeLists.txt
index b70335af6ca1be033178bf55ec30102ab1e86156..bddba6c0de902f8a667021ba52e5243c282f4530 100644
--- a/analysis/common/at_kfpf_interface/CMakeLists.txt
+++ b/analysis/common/at_kfpf_interface/CMakeLists.txt
@@ -1,60 +1,67 @@
 Set(LIBRARY_NAME AnalysisTreeKfpfInterface)
 
-  set(SRCS ATKFParticleFinder.cxx CutsContainer.cxx)
-
-    Set(INCLUDE_DIRECTORIES $ {CMAKE_CURRENT_SOURCE_DIR}
-
-        $ {KFParticle_INCLUDE_DIR} $ {AnalysisTree_INCLUDE_DIR})
-
-      Include_Directories($ {INCLUDE_DIRECTORIES})
-
-        Set(SYSTEM_INCLUDE_DIRECTORIES $ {VC_INCLUDE_DIRS} $ {
-          BASE_INCLUDE_DIRECTORIES} $ {Boost_INCLUDE_DIR})
-
-          Include_Directories(SYSTEM $ {SYSTEM_INCLUDE_DIRECTORIES})
-
-            set(LINK_DIRECTORIES $ {ROOT_LIBRARY_DIR} $ {
-              FAIRROOT_LIBRARY_DIR} $ {Boost_LIBRARY_DIRS} $ {Vc_LIB_DIR} $ {
-              KFParticle_LIB_DIR} $ {AnalysisTree_LIBRARY_DIR})
-
-              link_directories($ {LINK_DIRECTORIES})
-
-                IF(SSE_FOUND)
-                  Message(STATUS
-                          "${LIBRARY_NAME} will be compiled with SSE support")
-                    ADD_DEFINITIONS(-DHAVE_SSE) SET_SOURCE_FILES_PROPERTIES($ {
-                      SRCS} PROPERTIES COMPILE_FLAGS "-msse -O3")
-                      ELSE(SSE_FOUND) MESSAGE(
-                        STATUS
-                        "${LIBRARY_NAME} will be compiled without SSE support")
-                        SET_SOURCE_FILES_PROPERTIES($ {
-                          SRCS} PROPERTIES COMPILE_FLAGS "-msse -O3")
-                          ENDIF(SSE_FOUND)
-
-                            Set(LINKDEF AnalysisTreeKfpfInterfaceLinkDef.h)
-
-                              If(UNIX AND NOT APPLE)
-                                Set(_AnalysisTree_LIB AnalysisTreeBase
-                                      .so AnalysisTreeInfra.so) Else()
-                                  Set(_AnalysisTree_LIB AnalysisTreeBase
-                                        .dylib AnalysisTreeInfra.dylib) EndIf()
-
-                                    Set(DEPENDENCIES $ {
-                                      _AnalysisTree_LIB} KFParticle Vc.a)
-                                      Set(DEFINITIONS
-                                          - DDO_TPCCATRACKER_EFF_PERFORMANCE
-                                          - DNonhomogeneousField - DCBM
-                                          - DUSE_TIMERS)
-
-                                        ADD_DEFINITIONS($ {DEFINITIONS})
-
-                                          GENERATE_LIBRARY()
-
-#Install(FILES../../../ macro / analysis / common / analysis_tree_converter    \
-         / run_treemaker.C
-#DESTINATION share / cbmroot / macro / analysis_tree
-#)
-
-                                            Add_Dependencies(
-                                              AnalysisTreeKfpfInterface
-                                                ANALYSISTREE KFPARTICLE)
\ No newline at end of file
+set(SRCS
+        ATKFParticleFinder.cxx
+        CutsContainer.cxx
+    )
+
+Set(INCLUDE_DIRECTORIES
+  ${CMAKE_CURRENT_SOURCE_DIR}
+
+  ${KFParticle_INCLUDE_DIR}
+  ${AnalysisTree_INCLUDE_DIR}
+)
+
+Include_Directories (${INCLUDE_DIRECTORIES})
+
+Set(SYSTEM_INCLUDE_DIRECTORIES
+  ${VC_INCLUDE_DIRS}
+  ${BASE_INCLUDE_DIRECTORIES}
+  ${Boost_INCLUDE_DIR} 
+)
+
+Include_Directories (SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
+
+set (LINK_DIRECTORIES
+  ${ROOT_LIBRARY_DIR}
+  ${FAIRROOT_LIBRARY_DIR}
+  ${Boost_LIBRARY_DIRS}
+  ${Vc_LIB_DIR}
+  ${KFParticle_LIB_DIR}
+  ${AnalysisTree_LIBRARY_DIR}
+)
+ 
+link_directories(${LINK_DIRECTORIES})
+
+IF (SSE_FOUND)
+  Message(STATUS "${LIBRARY_NAME} will be compiled with SSE support")
+  ADD_DEFINITIONS(-DHAVE_SSE)
+  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS "-msse -O3")
+ELSE (SSE_FOUND)
+  MESSAGE(STATUS "${LIBRARY_NAME} will be compiled without SSE support")
+  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS "-msse -O3")
+ENDIF (SSE_FOUND)
+
+Set(LINKDEF AnalysisTreeKfpfInterfaceLinkDef.h)
+
+If(UNIX AND NOT APPLE)
+  Set(_AnalysisTree_LIB  AnalysisTreeBase.so AnalysisTreeInfra.so)
+  Else()
+  Set(_AnalysisTree_LIB  AnalysisTreeBase.dylib AnalysisTreeInfra.dylib)
+EndIf()
+
+Set(DEPENDENCIES 
+	${_AnalysisTree_LIB} 
+	KFParticle
+	Vc.a)
+Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
+
+ADD_DEFINITIONS(${DEFINITIONS})
+
+GENERATE_LIBRARY()
+
+# Install(FILES ../../../macro/analysis/common/analysis_tree_converter/run_treemaker.C
+#         DESTINATION share/cbmroot/macro/analysis_tree
+#        )
+
+Add_Dependencies(AnalysisTreeKfpfInterface ANALYSISTREE KFPARTICLE)
\ No newline at end of file