Refactor most of helpers into classes