As per Matei's suggestion, got rid of  wrappers for only map function.