Minor regex style tweaks