Validators: Code refactoring.
* Uses less variables.
* Reduces redundancies.
* Cleanup.
Merge pull request #1599 from am11/master

Validators: Code refactoring