Token safety practices

Follow