Fix CheckStyle errors, first attempt