Clean up a little...