Helpers refactor