simplify validator logic
simplify validator logic

mrvisser/Hilary,simong/Hilary,Orodan/Hilary,ExC0d3/Hilary,jfederico/Hilary,stuartf/Hilary,timdegroote/Hilary,timdegroote/Hilary,nicolaasmatthijs/Hilary,stuartf/Hilary,ExC0d3/Hilary,mrvisser/Hilary,Orodan/Hilary,nicolaasmatthijs/Hilary,Coenego/Hilary,jfederico/Hilary,simong/Hilary