refactoring mapping