Code Cleanup
Making some minor changes to TokenOp. Not completed.