Json Serializer: Fancy encoding
cleanup