Refactoring Game workflow