Minor game refactoring