STREAMS-105 | Code review feedback