STREAMS-145 | Responded to code review feedback