More regular expression cleanup