Fix CheckStyle errors