store: code review
transport: code review