style changes and typo fixes