refactoring of PotentialDatesService