Formatting data returned to Map