code style and typo fixes