Clean up some minor issue with JSON
Merge pull request #541 from tangentlabs/fix/cleanup_json_serialisation

Renamed variable shadowing builtin