code cleaning + token is transmitted via contructor