Fix typos, improve formatting