Finished refactoring Game classes