diff --git a/handlers/main.yml b/handlers/main.yml
index d2105ac..7a85b53 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,6 +1,7 @@
 ---
 
 - name: Restart isc-dhcp-server
-  service: name=isc-dhcp-server state=restarted
-
+  service:
+    name: 'isc-dhcp-server'
+    state: 'restarted'
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 4a919b6..b18e5c9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,13 +1,19 @@
 ---
 
-- name: Install DHCP server packages
-  apt: pkg={{ item }} state=latest install_recommends=no
+- name: Install DHCP packages
+  apt:
+    name: '{{ item }}'
+    state: 'present'
+    install_recommends: False
   with_items: [ 'isc-dhcp-server' ]
 
 - name: Configure DHCP server
-  template: src={{ item }}.j2 dest=/{{ item }} owner=root group=root mode=0644
+  template:
+    src: '{{ item }}.j2'
+    dest: '/{{ item }}'
+    owner: 'root'
+    group: 'root'
+    mode: '0644'
   with_items: [ 'etc/default/isc-dhcp-server', 'etc/dhcp/dhcpd.conf' ]
-  notify: Restart isc-dhcp-server
-
-
+  notify: [ 'Restart isc-dhcp-server' ]