Refactoring DatePredictor.