whitespace
Refactor validations.