Fix CheckStyle errors, fifth attempt