Add TODOs. Duplicate code in Tokens. Format comments
Remove unused parameter in StateButtonListener
Update .gitignore for workspace.xml in .idea/