Bit more cleanup - ready for a look-over