Bit of minor cleaning up.