Finished cleaning up the API