WS and comment cleanup