minor cleanup.
refactoring.