Changed: minor refactoring.