clean up a bit.