typo fixes and cleanup