Tidy up a little bit.