Refactor validations.

experiment ... feedback appreciated