Various style, typo and whitespace corrections