typos, reordering, formatting