Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Kirsten <69d155e5488e754f8df49ec64d1d8a3b36399b5a@gmail.com>
Co-authored-by: Josh Berkus <c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@agliodbs.com>
kubernetes/enhancements,kubernetes/enhancements,kubernetes/enhancements