Improved regular expression