Refactoring Job: map and promise