Minor clean up to minimize diff