Cleaning up main class