renamed some variables, oauth2 token now retrieves only when it is expired