- Minor refactoring.