Better use of `map`