raft: address comments