Refactoring game workflow