fixing regexes
re-indent