refactoring

separate mappings to simple transformations