Added better whitespace chomping
Added better whitespace chomping