Clean up Gson encoding