Drop the mapping logic out into a seperate function for code clarity (not a method tho)