Minor format changes using CheckStyle