Tidy up and use helpers.each