Supportive up for review

Prefer `map` over `collect`.