etcdserver: clean code