Cleanup and add getDayOfCurrentWeek method to DateUtility class.