Some CheckStyle errors fixed