Merge "Simplifying validators"