re-refactoring game