Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Guy Templeton <a4a48d751f9e5e607a24d0d4c190adedd1dd36f6@googlemail.com>
kubernetes/autoscaler,bskiba/autoscaler,bskiba/autoscaler,mmerrill3/autoscaler,mmerrill3/autoscaler,kubernetes/autoscaler,kubernetes/autoscaler,kubernetes/autoscaler,mmerrill3/autoscaler,bskiba/autoscaler,mmerrill3/autoscaler