Clean up main class'