Fix CheckStyle errors, eighth attempt