PedMap, major refactorings