Tweak regex

Cleaner results