Clean up and default values