refactoring : last transform to map