tidied

tidied regular expressions