Simplified the regular expression