Refactoring of map-based results