Some styling and refactoring.