Improved regexes to deal with whitespace