cwc: whitespace fixes and removal