Tidy up a bit more.