Cleanup
Add json-to-form and form-to-json
Clean form-to-json
Cleanup