Fixing formatting inconsistencies

I was browsing the code and noticed a lot of formatting inconsistencies, so I just went through and ran a single-pass IntelliJ format on all the files