Code cleanup
token issue