Lots of boring checkstyle things

I fixed a couple things to be mostly checkstyle compliant, but not
everything.