Cleaning and turn DayCount into a immutable class