Cassandra token generator: incorporate review comments