minor refactoring of property validator