Remove regex, replace with BeautifulSoup