Clean up and updated api calls