Cleaning up / updated pantry_api.c/.h