Rename
Minor changes: comment & simplify
Additional checks in validator