Whitespace removal fix (issue #81)

Just added the suggested RE's. (dont think we need any sub to trim whitespace)