A little more optimization work