Aesthetic refactoring.