Applied code review and fixed time calaculation.