A little more optimization