CheckStyle errors corrected