Clean-up a bit.