Clean up that tight filter/map step.