Bit of tidy up.