Tidy feature using existing helpers