Fixing some documentation
Adding support for expiring tokens
Some refactoring to reduce complexity scores
Updating documentation