Revert "Revert "Formatting, yay!""

This reverts commit 89b8c98b51461be3fc1368f7d8cd3291855a6044.