General styling and refactoring.