Refactor to use built-in date validator