Clean up
Fix #126 Download YAML and JSON are not working