diff --git a/main.py b/main.py
index 711c2e4..c9247e4 100644
--- a/main.py
+++ b/main.py
@@ -281,7 +281,7 @@ if __name__ == '__main__':
         if arguments.subcommand is None:
             application_parser.print_help()
 
-        if arguments.subcommand == 'list':
+        elif arguments.subcommand == 'list':
 
             if arguments.code:
 
@@ -333,7 +333,7 @@ if __name__ == '__main__':
         if arguments.subcommand is None:
             get_parser.print_help()
 
-        if arguments.subcommand == 'connection':
+        elif arguments.subcommand == 'connection':
             print(ConfigurationController.get_connection())
 
     elif arguments.command == 'set':
@@ -341,5 +341,5 @@ if __name__ == '__main__':
         if arguments.subcommand is None:
             set_parser.print_help()
 
-        if arguments.subcommand == 'connection':
+        elif arguments.subcommand == 'connection':
             ConfigurationController.set_connection(arguments.connection_type)