Refactoring, extracting mapper