Regex/formatting tweaks