Bit of cleanup - nothing big.