cleaned OSValidator a bit