maps refactoring done