Simplified regex ever so slightly