Regex slightly improved