Formatting, typo fixes