Refactoring: clean up structure of main class