cleaned up a few api calls