Fix CheckStyle errors..

Might want to tinker around with CS config a bit more.