Small refactoring.
Small refactoring.