Simplifying the logic for end dates and keeping it within the Model.