finished first round of regexes
clean up