Improved regex