Tidy-up. Fix typos