Helpers refactoring