Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Maksim Rakitin <80296ac3c2ec8894fe3994152b21dee0e30396ec@users.noreply.github.com>
ericdill/databroker,ericdill/databroker