Cleanup
Properly use default values if applicable