partial whitespace trimming added