Refinements to taking points off the DataValidator

More usual to have "} else if (...) {"