STREAMS-122 | Responded to code review feedback