Fix parser formatting inconsistencies, remove unnecessary spans