Cosmetic changes, refactoring.