Clean up code; Added Game class