US25-CodeReview for all packages

Updating validator's function