Fix CheckStyle errors, sixth attempt