cleaning. rename/order regexes for clarity.