Fix validation
Indent and simplification