* minor refactoring.