GameActivity refactor