Structural improvements
Legibility improvements
Added more token functionality