Clean up and additions made to Game