Added whitespace trimming