Add comments
remove useless parameter in initToken
Code cleaning: unify empty lines