Fixed and tidy up Regex