Just cleaning up the main class