Refactor game steps