More whitespace trimming