Refactoring Mapeditor