Fix CheckStyle errors, seventh attempt