Simplifying API token handling