Improving regex date