More refactoring of map scene.