Simplifed the improvement constraints.