Tidy up some stuff.