minor refactoring.