Formatting consistency 

For the sake of readability I ran a quick IntelliJ format on the codebase. A rather invasive changeset so please feel free to ignore.