More whitespace corrections