Fix some formatting and typos