Clean up of main class