Refactor milestones with current/previous notice