Remove unused variable
Correct reused variable name
Refactor exports and add `client-oauth2` dep