Refactor date regexp