Date validation refactoring?