Formatting, typos and additional comments