Helpers refactoring.