Simplify parsing