Optimization comment added
Token handler refactorings