diff --git a/src/commands/config_init.cr b/src/commands/config_init.cr
index df2ecee..2899954 100644
--- a/src/commands/config_init.cr
+++ b/src/commands/config_init.cr
@@ -18,7 +18,7 @@ module GX::Commands
       # Override the configuration path if provided
       puts "Configuration file path: #{config_file_path}"
       puts "Configuration file path: #{@config.path}"
-      pp @config
+      # pp @config
       @config.path.try do |path|
         config_file_path = path
         config_dir = File.dirname(path)
diff --git a/src/commands/global_version.cr b/src/commands/global_version.cr
index 944f026..5ab5fb3 100644
--- a/src/commands/global_version.cr
+++ b/src/commands/global_version.cr
@@ -8,7 +8,7 @@ require "../config"
 
 module GX::Commands
   class GlobalVersion < AbstractCommand
-    def initialize(config : GX::Config) # FIXME
+    def initialize(config : GX::Config)
     end
 
     def execute
diff --git a/src/commands/mapping_create.cr b/src/commands/mapping_create.cr
index 40dbaa7..d2882d1 100644
--- a/src/commands/mapping_create.cr
+++ b/src/commands/mapping_create.cr
@@ -7,7 +7,7 @@ require "./abstract_command"
 
 module GX::Commands
   class MappingCreate < AbstractCommand
-    def initialize(@config : GX::Config) # FIXME
+    def initialize(@config : GX::Config)
       @config.load_from_env
       @config.load_from_file
     end
diff --git a/src/commands/mapping_delete.cr b/src/commands/mapping_delete.cr
index 1849320..60a86e6 100644
--- a/src/commands/mapping_delete.cr
+++ b/src/commands/mapping_delete.cr
@@ -7,11 +7,11 @@ require "./abstract_command"
 
 module GX::Commands
   class MappingDelete < AbstractCommand
-    def initialize(config : GX::Config) # FIXME
+    def initialize(config : GX::Config)
     end
 
     def execute
-      # FIXME: implement
+      # TODO: implement
     end
 
     def self.handles_mode
diff --git a/src/commands/mapping_edit.cr b/src/commands/mapping_edit.cr
index 216cae9..2169173 100644
--- a/src/commands/mapping_edit.cr
+++ b/src/commands/mapping_edit.cr
@@ -7,11 +7,11 @@ require "./abstract_command"
 
 module GX::Commands
   class MappingEdit < AbstractCommand
-    def initialize(config : GX::Config) # FIXME
+    def initialize(config : GX::Config)
     end
 
     def execute
-      # FIXME: implement
+      # TODO: implement
     end
 
     def self.handles_mode
diff --git a/src/config.cr b/src/config.cr
index 853e7cc..cc7f43e 100644
--- a/src/config.cr
+++ b/src/config.cr
@@ -27,7 +27,6 @@ module GX
     record AddArgs, name : String, path : String
     record DelArgs, name : String
 
-    # getter filesystems : Array(Models::AbstractFilesystemConfig)
     getter home_dir : String
     getter root : Models::RootConfig?
 
diff --git a/src/file_storage.cr b/src/file_storage.cr
index 20a9d7b..3726461 100644
--- a/src/file_storage.cr
+++ b/src/file_storage.cr
@@ -10,4 +10,3 @@ class FileStorage
 
   bake_folder "../static"
 end
-
diff --git a/src/file_system_manager.cr b/src/file_system_manager.cr
index 5281b7c..088382a 100644
--- a/src/file_system_manager.cr
+++ b/src/file_system_manager.cr
@@ -42,10 +42,10 @@ module GX
     end
 
     def auto_open(filesystem)
-      # FIXME: detect xdg-open and use it if possible
-      # FIXME: detect mailcap and use it if no xdg-open found
-      # FIXME: support user-defined command in configuration
-      # FIXME: detect graphical environment
+      # TODO: detect xdg-open and use it if possible
+      # TODO: detect mailcap and use it if no xdg-open found
+      # TODO: support user-defined command in configuration
+      # TODO: detect graphical environment
 
       mount_point_safe = filesystem.mount_point
       raise Models::InvalidMountpointError.new("Invalid filesystem") if mount_point_safe.nil?
@@ -111,7 +111,7 @@ module GX
         }
       end
 
-      # # FIXME: feat: allow to sort by name or by filesystem
+      # FIXME: feat: allow to sort by name or by filesystem
       sorted_values = names_display.values.sort_by!(&.[:filesystem].name)
       result_filesystem_name = Utils::Fzf.run(sorted_values.map(&.[:ansi_name])).strip
       selected_filesystem = names_display[result_filesystem_name][:filesystem]