Fix typos, improve style