some regex niceness - everything fixed!
...that I can tell so far anyway :)

Signed-off-by: Steven Honeyman <stevenhoneyman@users.noreply.github.com>