Fix checkstyle violations and make checkstyle obligatory

Ah. Sure. I didn't look at the whole file. Thanks