Fix CheckStyle errors, fourth attempt