Some model updates on checkstyle