Updating regex to match more closely