Refactored unnecessary Promise and used a map to create the future with the result