STREAMS-152 | Code review feedback