[task] refactored token validation
Merge pull request #85 from dacrome/refactore-token-validation

Refactore token validation