Continuing refactoring of main
Continuing refactoring of main
Continuing refactoring of main
Continuing refactoring of main
Completed refactoring of main