diff --git a/README.rst b/README.rst
index 866b6bb..22055e7 100644
--- a/README.rst
+++ b/README.rst
@@ -1,15 +1,15 @@
 
-==================================
-ETCD Formula
-==================================
+====
+etcd
+====
 
-Service etcd description
+A distributed, reliable key-value store for the most critical data of a distributed system.
 
 Sample pillars
 ==============
 
-Single etcd service
----------------------
+Standalone etcd service
+-----------------------
 
 .. code-block:: yaml
 
@@ -24,7 +24,7 @@
           name: etcd01
           port: 4001
 
-Cluster etcd service
+Clustered etcd service
 ----------------------
 
 .. code-block:: yaml
@@ -46,8 +46,8 @@
           name: etcd03
           port: 4001
 
-ETCD proxy
--------------
+etcd proxy
+----------
 
 .. code-block:: yaml
 
@@ -57,16 +57,10 @@
         bind:
           host: 10.0.175.101
         proxy: true
-        members:
-        - host: 10.0.175.101
-          name: etcd01
-        - host: 10.0.175.102
-          name: etcd02
-        - host: 10.0.175.103
-          name: etcd03
 
-run ETCD on k8s
----------------
+
+etcd on k8s
+-----------
 
 .. code-block:: yaml
 
@@ -77,4 +71,4 @@
 Read more
 =========
 
-* links
+* https://coreos.com/etcd/
diff --git a/etcd/files/default b/etcd/files/default
index 3224dff..890a4fc 100644
--- a/etcd/files/default
+++ b/etcd/files/default
@@ -2,7 +2,7 @@
 ## etcd(1) daemon options
 ## See "/usr/share/doc/etcd/Documentation/configuration.md.gz".
 
-{%- if server.proxy is defined %}
+{%- if server.proxy %}
 
 ### Proxy Flags
 
@@ -40,8 +40,8 @@
 ## default: 0
 # ETCD_PROXY_READ_TIMEOUT="0"
 
-
 {%- else %}
+
 ### Member Flags
 
 ##### -name
@@ -268,4 +268,5 @@
 
 #### Daemon parameters:
 # DAEMON_ARGS=""
-{% endif %}
\ No newline at end of file
+
+{%- endif %}
\ No newline at end of file
diff --git a/etcd/init.sls b/etcd/init.sls
index cddcbaa..4138a75 100644
--- a/etcd/init.sls
+++ b/etcd/init.sls
@@ -1,3 +1,4 @@
+
 {%- if pillar.etcd is defined %}
 include:
 {%- if pillar.etcd.server is defined %}
diff --git a/etcd/map.jinja b/etcd/map.jinja
index cd2aa98..c5c7e01 100644
--- a/etcd/map.jinja
+++ b/etcd/map.jinja
@@ -1,7 +1,10 @@
-{% set server = salt['grains.filter_by']({
+
+{%- set server = salt['grains.filter_by']({
     'Debian': {
         'pkgs': ['etcd', 'python-etcd'],
-        'services': ['etcd']
+        'services': ['etcd'],
+        'proxy': False,
+        'engine': 'systemd'
     },
     'RedHat': {
         'pkgs': [],
diff --git a/etcd/meta/sphinx.yml b/etcd/meta/sphinx.yml
index b9f1250..ae126dc 100644
--- a/etcd/meta/sphinx.yml
+++ b/etcd/meta/sphinx.yml
@@ -1,12 +1,8 @@
 {%- from "etcd/map.jinja" import server with context %}
-# Fill in documentation details
 doc:
   name: etcd
-  description: Some service info
+  description: Distributed key-value store
   role:
     server:
       name: server
-      param:
-        some_param:
-          name: "Some name"
-          value: "some value"
+      param: {}
diff --git a/etcd/server.sls b/etcd/server.sls
index 2f0ddf4..a668afd 100644
--- a/etcd/server.sls
+++ b/etcd/server.sls
@@ -4,12 +4,8 @@
 etcd_packages:
   pkg.installed:
   - names: {{ server.pkgs }}
-{%- if server.get('engine', 'systemd') %}
-  - require:
-    - file: /etc/default/etcd
-{%- endif %}
 
-{%- if server.get('engine', 'systemd') == 'kubernetes' %}
+{%- if server.engine == 'kubernetes' %}
 
 etcd_service:
   service.dead:
@@ -24,20 +20,26 @@
 
 /etc/kubernetes/manifests/etcd.manifest:
   file.managed:
-    - source: salt://etcd/files/etcd.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
+  - source: salt://etcd/files/etcd.manifest
+  - template: jinja
+  - user: root
+  - group: root
+  - mode: 644
+  - makedirs: true
+  - dir_mode: 755
 
-{%- else %}
+{%- endif %}
+
+{%- if server.engine == 'systemd' %}
 
 /etc/default/etcd:
   file.managed:
-    - source: salt://etcd/files/default
-    - template: jinja
+  - source: salt://etcd/files/default
+  - template: jinja
+  - require_in:
+    - pkg: etcd_packages
+
+{%- endif %}
 
 etcd:
   service.running:
@@ -45,6 +47,8 @@
   - name: {{ server.services }}
   - watch:
     - file: /etc/default/etcd
+  - require:
+    - pkg: etcd_packages
 
 {%- endif %}