Clean up a few regexs