modify how the main class is instantiated, remove some code