Bit of tidy up