whitespace cleanup
using match-string instead of manual parsing the result