fix checkImpl() so that it doesnt have errors

We need to stop recursively checkImpl() when at Zone, as otherwise we
check past it, and cause errors

Also some formatting