A little tidy up; nothing too big