Whitespace and CS fixing, phase 1.