Fix helpers.each
Tidy up and use helpers.each