Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Christopher Hein <b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrishein.com>
kubernetes-sigs/multi-tenancy,kubernetes-sigs/multi-tenancy