Formatting etc.
Refactoring.
More formatting.