Minor code refactoring.
Small refactoring.