- cleaning up the code for etcd