Some cosmetic refactoring.