[ecurrent] clean up regexes and make elapsed time read better