Merge pull request #5984 from bryan-cox/codebase-cleanup

refactor: extract helper methods to reduce cyclomatic complexity

Author: k8s-ci-robot