diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml
index 21997784b..58614e610 100644
--- a/roles/wordpress/tasks/install.yml
+++ b/roles/wordpress/tasks/install.yml
@@ -1,17 +1,17 @@
 - name: Get the WordPress software
-  get_url: url="{{ wordpress_download_base_url }}/{{ wordpress_src }}"  dest={{ downloads_dir }}/
+  get_url: url="{{ wordpress_download_base_url }}/{{ wordpress_src }}" dest={{ downloads_dir }}/
   register: wp_download_output
   when: internet_available
 
 - name: Copy it to permanent location /library
-  unarchive: src={{ wp_download_output.dest }}  dest=/library
+  unarchive: src={{ wp_download_output.dest }} dest=/library
   when: internet_available
 
 - name: Rename /library/wordpress* to /library/wordpress
   shell: if [ ! -d {{ wp_abs_path }} ]; then mv {{ wp_abs_path }}* {{ wp_abs_path }}; fi
 
 # First pass at permissions and ownership
-- name: Make apache owner and group
+- name: Make Apache owner and group
   file: path={{ wp_abs_path }}
         recurse=yes
         owner=root
@@ -19,7 +19,7 @@
         mode=0664
         state=directory
 
-- name: Make directories 775 so apache can traverse and write
+- name: Make directories 775 so Apache can traverse and write
   command: "/usr/bin/find {{ wp_abs_path }} -type d -exec chmod 775 {} +"
 
 - name: Copy wp salt values
@@ -45,15 +45,15 @@
   file: path=/tmp/get-iiab-wp-salts
         state=absent
 
-- name: mysql database needs to be running if we are trying to create a new db
+- name: MySQL database needs to be running if we are trying to create a new db
   service: state=started
            name='{{ mysql_service }}'
 
-- name: Create mysql wordpress database
+- name: Create MySQL wordpress database
   mysql_db: name={{ wp_db_name }}
             state=present
 
-- name: Create mysql wordpress database user
+- name: Create MySQL wordpress database user
   mysql_user: name={{ wp_db_user }}
               password={{ wp_db_user_password }}
               priv={{ wp_db_name }}.*:ALL,GRANT
@@ -70,22 +70,21 @@
   template: src=wordpress.conf.j2
             dest=/etc/{{ apache_config_dir }}/wordpress.conf
 
-- name: Enable httpd conf file if we are disabled
+- name: Enable httpd conf file if we are disabled (debuntu)
   file: path=/etc/apache2/sites-enabled/wordpress.conf
         src=/etc/apache2/sites-available/wordpress.conf
         state=link
   when: wordpress_enabled and is_debuntu
 
-
-- name: Remove httpd conf file if we are disabled
+- name: Remove httpd conf file if we are disabled (OS's other than debuntu)
   file: path=/etc/apache2/sites-enabled/wordpress.conf
         state=absent
   when: not wordpress_enabled and is_debuntu
 
-- name: Restart apache, so it picks up the new aliases
+- name: Restart Apache, so it picks up the new aliases
   service: name={{ apache_service }} state=restarted
 
-- name: Add wordpress to service list
+- name: Add 'wordpress' to service list
   ini_file: dest='{{ service_filelist }}'
             section=wordpress
             option='{{ item.option }}'