Bits of tidy up