Cleanup, and set defaults