Fix Checkstyle issues in policy-models