token refactorization done
refactor as done as it is going to get before client meeting