Complete refactor of helpers