Refactoring map places finished