Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Lili Cosic <abbefa0cd2ee4e8134fc65e397abb2e379f8022d@gmail.com>
gyuho/etcd,mqliang/etcd,rnaveiras/etcd,mqliang/etcd,ajityagaty/etcd,etcd-io/etcd,mkumatag/etcd,ajityagaty/etcd,gyuho/etcd,rnaveiras/etcd,mkumatag/etcd,mkumatag/etcd,rnaveiras/etcd,etcd-io/etcd,etcd-io/etcd,mqliang/etcd,ajityagaty/etcd