Small refactoring changes.