Formatting and typo fixes