helpers refactoring