Improved regex for less post processing