STREAMS-113 | Code review feedback