Clean up a bit.