Simplify code now that we are normalizing all data prior to parsing