Fix CheckStyle errors, second attempt