Cleaned up some regex.