Small helpers refactoring.
Small helpers refactoring.