Fix CheckStyle errors, third attempt