Cleanup JSON generation, use sjson