Extra refactors on increment calculations on projects and milestones models