Cleanup and adding a call for account uri retrieval