Reorder and fix grammar/typos