updating regexes and cleaning up