Cleaning up API Token handling code and base_uri