access_token storage and code refactoring