diff --git a/defaults/main.yml b/defaults/main.yml
index 49e640a..86f59f9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,7 +9,7 @@ dns_servers:
   - 1.0.0.1
   - 1.1.1.1
 
-ADMIN_GROUP: admins
+admin_group: admins
 
 
 common_grub_timeout: 5
diff --git a/handlers/main.yml b/handlers/main.yml
index b988e1b..1787db9 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -15,10 +15,10 @@
     name: ntpd
     state: restarted
 
-- name: reboot windows
+- name: Reboot Windows
   win_reboot:
 
-- name: restart NetworkManager
+- name: Restart NetworkManager
   service:
     name: NetworkManager
     state: restarted
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 5a587e8..dfcec82 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -38,7 +38,9 @@
 #  tags: security
 
 - name: Create admin group
-  group: name={{ ADMIN_GROUP }} state=present
+  group:
+    name: "{{ admin_group }}"
+    state: present
 
 - name: Configure yum limit
   lineinfile:
diff --git a/tasks/Windows.yml b/tasks/Windows.yml
index 53a8e9e..a1c659c 100644
--- a/tasks/Windows.yml
+++ b/tasks/Windows.yml
@@ -30,7 +30,7 @@
     admin_password: "{{ vault_ad_password }}"
     domain_name: "{{ authconfig_domain }}"
   when: ad_domain_joined
-  notify: reboot windows
+  notify: Reboot Windows
 - meta: flush_handlers
 
 - name: Ensure Important dirs exist
@@ -53,7 +53,7 @@
 - name: Apply Windows Updates
   win_updates:
   when: apply_windows_updates
-  notify: reboot windows
+  notify: Reboot Windows
 - meta: flush_handlers
 
 - name: Ensure default applications installed
diff --git a/tasks/communication.yml b/tasks/communication.yml
index 0e12bf0..e0addae 100644
--- a/tasks/communication.yml
+++ b/tasks/communication.yml
@@ -2,7 +2,7 @@
 - name: Postfix Configuration
   when: postfix_configure
   block:
-    - name: postfix | Apply postfix configuration
+    - name: Postfix | Apply postfix configuration
       lineinfile:
         dest: "{{ configurations.dest }}"
         regexp: "{{ configurations.regexp }}"
@@ -34,7 +34,7 @@
       loop_control:
         loop_var: configurations
 
-    - name: postfix | Ensure Postfix is Started/Enabled
+    - name: Postfix | Ensure Postfix is Started/Enabled
       service:
         name: postfix
         state: started
diff --git a/tasks/networking.yml b/tasks/networking.yml
index 5ef9c50..7f34a64 100644
--- a/tasks/networking.yml
+++ b/tasks/networking.yml
@@ -67,7 +67,7 @@
     backup: yes
   when: (ansible_os_family == "RedHat" and ansible_distribution_major_version == "7")
   notify:
-    - restart NetworkManager
+    - Restart NetworkManager
   changed_when: false
 
 - name: Ensure correct permissions (hosts/resolv.conf)