Check token types
Minor refactors
Refresh tokens
Token service refactoring