Address fourth round of comments
Address fourth round of comments

kubernetes/community,pwittrock/community,bgrant0607/community,kubernetes/community,kubernetes/community,bgrant0607/community,pwittrock/community