Made the Token a function
Small simplifications to the Token class