diff --git a/handlers/main.yml b/handlers/main.yml
index 16b766b..92971d2 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: restart nginx
-  command: service nginx restart
\ No newline at end of file
+  service: name=nginx state=restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index b55fa4f..66ddc0c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,24 +8,14 @@
     nginx_user: "{{ __nginx_user }}"
   when: nginx_user is not defined
 
-# Nginx setup.
-- name: Enable nginx repo (RedHat).
-  template:
-    src: nginx.repo.j2
-    dest: /etc/yum.repos.d/nginx.repo
-    owner: root
-    group: root
-    mode: 0644
-  when: ansible_os_family == 'RedHat'
-
-- name: Ensure nginx is installed (RedHat).
-  yum: pkg=nginx state=installed enablerepo=nginx
+# Setup/install tasks.
+- include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- name: Ensure nginx is installed (Debian).
-  apt: pkg=nginx state=installed
+- include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
+# Nginx setup.
 - name: Copy nginx configuration in place.
   template:
     src: nginx.conf.j2
diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
new file mode 100644
index 0000000..7d30a27
--- /dev/null
+++ b/tasks/setup-Debian.yml
@@ -0,0 +1,3 @@
+---
+- name: Ensure nginx is installed.
+  apt: pkg=nginx state=installed
diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
new file mode 100644
index 0000000..73f205e
--- /dev/null
+++ b/tasks/setup-RedHat.yml
@@ -0,0 +1,11 @@
+---
+- name: Enable nginx repo.
+  template:
+    src: nginx.repo.j2
+    dest: /etc/yum.repos.d/nginx.repo
+    owner: root
+    group: root
+    mode: 0644
+
+- name: Ensure nginx is installed.
+  yum: pkg=nginx state=installed enablerepo=nginx