refactor
fix for get_token
refactor response messages