helpers refactoring
helpers refactoring