Refactoring GameMap #9, #10, #11