Typo fixes and cleanup