Better whitespace trimming