Minor code refinement
Minor code refinement

takenspc/validator,validator/validator,validator/validator,validator/validator,takenspc/validator,takenspc/validator,tripu/validator,takenspc/validator,validator/validator,tripu/validator,tripu/validator,takenspc/validator,tripu/validator,tripu/validator,validator/validator