Typo fixes and tidy-ups