Clean up the code for the new version of the game