minor refactoring.
minor.