Tidy things up.