Cleaned the main game class