Quite a bit of work on quite a bit of things. IntelliJ also decided to f...

...ix spacing.