Cleaned up some of the async callbacks