Refactor to pull out regex