diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index 23d45d5d2..3d661a417 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -1,4 +1,4 @@
-# INSTALL THE LATEST CALIBRE (calibre-server etc) ON ALL OS'S
+# 1. INSTALL THE LATEST CALIBRE (calibre-server etc) ON ALL OS'S
 
 # RUNS IF /usr/bin/calibre-uninstall DOES NOT ALEADY EXIST
 - name: Install Calibre via calibre-installer.py (OS's other than Raspbian)
@@ -10,7 +10,7 @@
   include_tasks: debs.yml
   when: is_rpi
 
-# CREATE CALIBRE DATABASE WITH A SAMPLE BOOK
+# 2. CREATE CALIBRE DATABASE WITH A SAMPLE BOOK
 
 - name: Check if /library/calibre/metadata.db exists
   stat:
@@ -21,7 +21,7 @@
   include_tasks: config-db.yml
   when: not calibre_db.stat.exists
 
-# WRAP UP CALIBRE INSTALLATION
+# 3. WRAP UP CALIBRE INSTALLATION
 
 - name: Create calibre-serve.service and calibre.conf
   template:
@@ -55,9 +55,9 @@
     name: calibre-serve
     enabled: yes
     state: started
-    #async: 900
-    #poll: 5
   when: calibre_enabled
+  #async: 900
+  #poll: 5
 
 #- name: Disable Calibre service -- stops calibre-server by Kovid Goyal
 #  service: name=calibre-serve