Refactored tokens a bit