More better regex improvements