Fix checkstyle violations in schema