Modify regular expression and remove angle bracket