Some styling, some refactoring.