tidy things up again