Basic formatting.
Formatting and refactorings.