STREAMS-145 | Code review feedback