Fix spelling error
Prune TODO
Use question mark methods in validator; make sure to alias proper method