refactor names of helpers