Whitespace and minor pruning