Making a `map` block prettier and easier to read