Formatting and refactoring.