A little cleanup on a couple of bits.