--minor refactoring.