more maps refactorings