Some tidy up work.