Refactor Map in terms of a Vector of Pairs