[InteractiveMaps] Code refactoring