Refactor game scenes