improvement of mappers previous refactoring