diff --git a/AculData/CMakeLists.txt b/AculData/CMakeLists.txt
index 3cf53b2df681770a0fb4e1c53e988b5069b4064b..b47d0c235e188347c42b84d38ac45a9089faa16f 100644
--- a/AculData/CMakeLists.txt
+++ b/AculData/CMakeLists.txt
@@ -6,15 +6,9 @@ ROOT_STANDARD_LIBRARY_PACKAGE(AculData
   HEADERS
     AculCalibCsI.h
     AculCalibration.h
-    # ConfigDictionary.h
-    # ReturnCodes.h
-    # AculDataLinkDef.h
   SOURCES
     AculCalibCsI.cpp
     AculCalibration.cpp
-    # ConfigDictionary.cpp
-#   DICTIONARY_OPTIONS
-#     -writeEmptyRootPCM
 #   DEPENDENCIES
 #     MathCore
 #     Matrix
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fbc3f1b58f9e7fed23125295f8db92a79399231..0b667c5fd8fcfd6f38102b8d7ece0413b034bef2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(AculUtils)
 
-
 # Find ROOT package
 find_package(ROOT REQUIRED)
 
@@ -9,73 +8,12 @@ find_package(ROOT REQUIRED)
 include_directories(${ROOT_INCLUDE_DIRS})
 # Print the value of ROOT_INCLUDE_DIRS
 message(STATUS "ROOT include directories: ${ROOT_INCLUDE_DIRS}")
-# message(STATUS "target_link_libraries(TELoss): ${ROOT_LIBRARIES}")
-
-# include_directories(TELoss)
 
-# Add the TELoss directory
+# Add the subdirectories
 add_subdirectory(TELoss)
 add_subdirectory(AculData)
 
-# Add the "TELoss" directory to the include path
-# include_directories(TELoss)
-
-# Add the source files
-# set(SOURCES
-#     TELoss/TELoss.cpp
-#     TELoss/TELoss.h
-#     TELoss/linkdef.h
-# )
-
-# # Add the Fortran source file
-# set(FORTRAN_SOURCES
-#     TELoss/ELOSS.f90
-# )
-
 # Set the output directory for the dictionary files
-# set(GEN_DICT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/TELoss)
 set(GEN_DICT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
 message(STATUS "CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}")
-message(STATUS "GEN_DICT_OUTPUT_DIR: ${GEN_DICT_OUTPUT_DIR}")
-
-# Generate dictionary for TELoss class
-
-# #working
-# ROOT_GENERATE_DICTIONARY(G__TELoss ${CMAKE_CURRENT_SOURCE_DIR}/TELoss/TELoss.h
-#     LINKDEF TELoss/TELossLinkDef.h)
-
-message(STATUS "CMAKE_CURRENT_SOURCE_DIR: ${CMAKE_CURRENT_SOURCE_DIR}")
-
-# ROOT_GENERATE_DICTIONARY(G__TELoss TELoss/TELoss.h LINKDEF TELoss/linkdef.h OPTIONS -I${CMAKE_CURRENT_SOURCE_DIR}/TELoss -o ${CMAKE_CURRENT_BINARY_DIR}/TELoss)
-
-# ROOT_GENERATE_DICTIONARY(G__TELoss ${CMAKE_CURRENT_SOURCE_DIR}/TELoss/TELoss.h 
-#  LINKDEF TELoss/TELossLinkDef.h 
-#  OPTIONS -I${CMAKE_CURRENT_SOURCE_DIR}/TELoss -o ${GEN_DICT_OUTPUT_DIR})
-
-# ROOT_GENERATE_DICTIONARY(G__TELoss ${CMAKE_CURRENT_SOURCE_DIR}/TELoss/TELoss.h 
-#     # MODULE TELoss
-#     # LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/TELoss/TELossLinkDef.h 
-#     LINKDEF TELoss/TELossLinkDef.h
-#     OPTIONS -o ${GEN_DICT_OUTPUT_DIR})
-
-
-# Add the dictionary source file to the sources list
-# list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/G__TELoss.cxx)
-# list(APPEND SOURCES ${GEN_DICT_OUTPUT_DIR}/G__TELoss.cxx)
-message(STATUS "SOURCES: ${SOURCES}")
-
-# Add an executable target for the C++ class
-# add_library(TELoss SHARED TELoss/TELoss.cpp TELoss/TELoss.h TELoss/linkdef.h TELoss/ELOSS.f90 ${GEN_DICT_OUTPUT_DIR}/G__TELoss.cxx)
-
-#working
-# add_library(TELoss SHARED TELoss/TELoss.cpp TELoss/TELoss.h TELoss/TELossLinkDef.h TELoss/ELOSS.f90 G__TELoss.cxx)
-
-# add_library(TELoss SHARED ${SOURCES} ${FORTRAN_SOURCES})
-
-# Link ROOT libraries
-# target_link_libraries(TELoss ${ROOT_LIBRARIES})
-# target_link_libraries(TELoss PUBLIC ROOT::Core)
-
-# Set compiler flags for Fortran source
-# enable_language(Fortran)
-# set_source_files_properties(${FORTRAN_SOURCES} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/modules)
+message(STATUS "GEN_DICT_OUTPUT_DIR: ${GEN_DICT_OUTPUT_DIR}")
\ No newline at end of file
diff --git a/TELoss/CMakeLists.txt b/TELoss/CMakeLists.txt
index c48b777294dbdf6ccc235265aa826e42c79bd730..a84d6d4d41e771fe304324ec75bd67dd0a15a27a 100644
--- a/TELoss/CMakeLists.txt
+++ b/TELoss/CMakeLists.txt
@@ -1,4 +1,6 @@
-# CMakeLists.txt in the TELoss directory
+############################################################################
+# CMakeLists.txt file for building TELoss package
+############################################################################
 
 include_directories(TELoss)
 
@@ -29,10 +31,6 @@ ROOT_GENERATE_DICTIONARY(
     LINKDEF 
         ${CMAKE_CURRENT_SOURCE_DIR}/TELossLinkDef.h)
 
-#working
-# ROOT_GENERATE_DICTIONARY(G__TELoss ${CMAKE_CURRENT_SOURCE_DIR}/TELoss/TELoss.h
-#     LINKDEF TELoss/TELossLinkDef.h)
-
 # Add the dictionary source file to the sources list
 list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/G__TELoss.cxx)