Tidy up a few bits.