regex refactoring ready to merge
ticked off one todo
capturing done
tidy