s/redis/kafka
Incorporate comments