Feature/token standardization

@srossross as per our conversation