Model Checkstyle updates