More refactoring in game view