Address code review items
Address code review items

Signed-off-by: Steven Sheehy <3a6b7d653d301b28a92d8268c7e41e2a0d5b9b90@firescope.com>

grafana/loki,grafana/loki,grafana/loki,grafana/loki,grafana/loki,grafana/loki