Minor changes on Date Calculation