code cleaning
debug: callback error if wrong token
code cleaning