Fix high priority checkstyle