A little more factoring out.