Cleanup, better defaults