Clean up regular expressions