Fix parser code layout