Refactoring game class