clean-regexp

Clean up regular expressions