Minor code style and typo fixes