clean up toJson