Cleanup
DiscountedDays method extraction