More work on game refactoring