Checkstyle/3.x/spi

Second round of Checkstyle compliance SPI.

Next round contains cleanup for whatever else is missing.
I don't understand why these lines were changed in my pr. I guessed I must have messed up somehow.