Tweak CustomValidation to make more readable