Cleaning up a bit.