improved regexes for better cleaning