Refreshing tokens now kind of works
Refactoring