Add some formatting and typo fixes