regex fix and some refactoring

[purcell]

Thanks, applied selectively and tidied up. For future reference, it's usually better to rewrite your commits rather than add extra "fix" commits. Appreciate your help!