Polishing comments and eliminating typos