fix current checkstyle errors

fix the checkstyle errors in current master