diff --git a/roles/pathagar/tasks/main.yml b/roles/pathagar/tasks/main.yml
index 3ee3308e8..1e9a9902f 100644
--- a/roles/pathagar/tasks/main.yml
+++ b/roles/pathagar/tasks/main.yml
@@ -1,27 +1,31 @@
-- name: Remove if exist pathagar rpm version
-  package: name=pathagar
-           state=absent
+- name: Remove package Pathagar (in case rpm?)
+  package:
+    name: pathagar
+    state: absent
 
-- name: Install pathagar pre requisites (both fedora and debian)
-  package: name={{ item }}
-           state=present
+- name: Install Pathagar prerequisites (both fedora and debian)
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
     - python-virtualenv
     - python-pip
     - python-psycopg2
 
-- name: Install pathagar pre requisites for debian
-  package: name={{ item }}
-           state=present
+- name: Install Pathagar prerequisites (debuntu)
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
     - libapache2-mod-wsgi
     - libxml2-dev
     - libxslt-dev
   when: is_debuntu
 
-- name: Install pathagar pre requisites not debian
-  package: name={{ item }}
-           state=present
+- name: Install Pathagar prerequisites (not debuntu)
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
     - mod_wsgi
     - libxml2-devel
@@ -29,32 +33,37 @@
   when: not is_debuntu
 
 - name: Create destination folder
-  file: path={{ pathagar_src }}
-        state=directory
-        owner=root
-        group=root
-        mode=0755
+  file:
+    path: "{{ pathagar_src }}"
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
 
 - name: Create books destination folder
-  file: path={{ pathagar_media }}
-        state=directory
-        owner={{ apache_user }}
-        group={{ apache_user }}
-        mode=0755
+  file:
+    path: "{{ pathagar_media }}"
+    state: directory
+    owner: "{{ apache_user }}"
+    group: "{{ apache_user }}"
+    mode: 0755
 
-- name: Determine if pathagar has already been downloaded from git
-  stat: path="{{ pathagar_src }}/settings.py"
+- name: Determine if Pathagar has already been downloaded from git
+  stat:
+    path: "{{ pathagar_src }}/settings.py"
   register: pathagar
 
-- name: Clone pathagar repo
-  git: repo=https://github.com/PathagarBooks/pathagar.git
-       dest={{ pathagar_src }}
-       update=yes
-       version=master
-  when: internet_available  and pathagar.stat.exists is defined and not pathagar.stat.exists
+- name: Clone Pathagar repo
+  git:
+    repo: https://github.com/PathagarBooks/pathagar.git
+    dest: "{{ pathagar_src }}"
+    update: yes
+    version: master
+  when: internet_available and pathagar.stat.exists is defined and not pathagar.stat.exists
 
-- name: Install pathagar requirements in a virtualenv
-  pip: name={{ item }}
+- name: Install Pathagar requirements in a virtualenv
+  pip:
+    name: "{{ item }}"
   with_items:
     - Django==1.4.5
     - django-tagging==0.3.1
@@ -62,117 +71,134 @@
     - lxml==3.4.4
   when: internet_available
 
-- name: Install pathagar requirements in a virtualenv
-  pip: name={{ item }}
-       extra_args="--use-wheel"
-       virtualenv={{ pathagar_venv }}
-       virtualenv_site_packages=yes
+- name: Install Pathagar requirements in a virtualenv
+  pip:
+    name: "{{ item }}"
+    extra_args: "--use-wheel"
+    virtualenv: "{{ pathagar_venv }}"
+    virtualenv_site_packages: yes
   with_items:
     - django-taggit==0.14
 
-- name: Create pathagar postgresql user
-  postgresql_user: name={{ pathagar_db_user }}
-                   password={{ pathagar_db_password }}
-                   role_attr_flags=NOSUPERUSER,NOCREATEROLE,NOCREATEDB
-                   state=present
+- name: Create Pathagar postgresql user
+  postgresql_user:
+    name: "{{ pathagar_db_user }}"
+    password: "{{ pathagar_db_password }}"
+    role_attr_flags: NOSUPERUSER,NOCREATEROLE,NOCREATEDB
+    state: present
   become: yes
   become_user: postgres
 
 - name: Start postgresql-iiab
-  service: name=postgresql-iiab
-           state=started
+  service:
+    name: postgresql-iiab
+    state: started
 
-- name: Enable pathagar postgresql user access by md5 method
-  lineinfile: backup=yes
-              dest=/library/pgsql-iiab/pg_hba.conf
-              regexp="^host\s+pathagar"
-              line="host    pathagar        pathagar     samehost     md5"
-              state=present
-              insertafter="^# IPv4 local connections"
-              owner=postgres
-              group=postgres
+- name: Enable Pathagar postgresql user access by md5 method
+  lineinfile:
+    backup: yes
+    dest: /library/pgsql-iiab/pg_hba.conf
+    regexp: "^host\s+pathagar"
+    line: "host    pathagar        pathagar     samehost     md5"
+    state: present
+    insertafter: "^# IPv4 local connections"
+    owner: postgres
+    group: postgres
   register: enable_pathagar_md5_access
 
 - name: Reload postgresql service
-  service: name=postgresql-iiab
-           state=reloaded
+  service:
+    name: postgresql-iiab
+    state: reloaded
   when: enable_pathagar_md5_access.changed
 
 - name: Create pathagar postgresql database
-  postgresql_db: name={{ pathagar_db_name }}
-                 encoding=utf8
-                 owner={{ pathagar_db_user }}
-                 state=present
-                 template=template0
+  postgresql_db:
+    name: "{{ pathagar_db_name }}"
+    encoding: utf8
+    owner: "{{ pathagar_db_user }}"
+    state: present
+    template: template0
   become: yes
   become_user: postgres
 
-- name: Install XS custom settings for patahgar
-  template: src=prod_settings.py
-            dest={{ pathagar_src }}/prod_settings.py
-            owner=root
-            group=root
-            mode=0644
+- name: Install IIAB custom settings for Pathagar
+  template:
+    src: prod_settings.py
+    dest: "{{ pathagar_src }}/prod_settings.py"
+    owner: root
+    group: root
+    mode: 0644
 
-- name: Create pathagar initial db
-  django_manage: app_path={{ pathagar_src }}
-                 command=syncdb
-                 virtualenv={{ pathagar_venv }}
-                 settings=pathagar.prod_settings
+- name: Create Pathagar initial db
+  django_manage:
+    app_path: "{{ pathagar_src }}"
+    command: syncdb
+    virtualenv: "{{ pathagar_venv }}"
+    settings: pathagar.prod_settings
 
-- name: Upload pathagar admin user
-  template: src=auth.User.json
-            dest={{ pathagar_dir }}/auth.User.json
-            owner=root
-            group=root
-            mode=0600
+- name: Upload Pathagar admin user
+  template:
+    src: auth.User.json
+    dest: "{{ pathagar_dir }}/auth.User.json"
+    owner: root
+    group: root
+    mode: 0600
 
-- name: Load pathagar admin user
-  django_manage: app_path={{ pathagar_src }}
-                 command=loaddata
-                 virtualenv={{ pathagar_venv }}
-                 settings=pathagar.prod_settings
-                 fixtures={{ pathagar_dir }}/auth.User.json
+- name: Load Pathagar admin user
+  django_manage:
+    app_path: "{{ pathagar_src }}"
+    command: loaddata
+    virtualenv: "{{ pathagar_venv }}"
+    settings: pathagar.prod_settings
+    fixtures: "{{ pathagar_dir }}/auth.User.json"
 
-- name: Collect pathagar static files
-  django_manage: app_path={{ pathagar_src }}
-                 command=collectstatic
-                 virtualenv={{ pathagar_venv }}
-                 settings=pathagar.prod_settings
+- name: Collect Pathagar static files
+  django_manage:
+    app_path: "{{ pathagar_src }}"
+    command: collectstatic
+    virtualenv: "{{ pathagar_venv }}"
+    settings: pathagar.prod_settings
 
-- name: Install wsgi.py for patahgar
-  template: src=wsgi.py
-            dest={{ pathagar_dir }}/wsgi.py
-            owner=root
-            group=root
-            mode=0644
+- name: Install wsgi.py for Pathagar
+  template:
+    src: wsgi.py
+    dest: "{{ pathagar_dir }}/wsgi.py"
+    owner: root
+    group: root
+    mode: 0644
 
-- name: Install httpd conf for pathagar
-  template: src=pathagar.conf
-            backup=yes
-            dest=/etc/{{ apache_config_dir }}/pathagar.conf
-            mode=0644
+- name: Install httpd conf for Pathagar
+  template:
+    src: pathagar.conf
+    backup: yes
+    dest: "/etc/{{ apache_config_dir }}/pathagar.conf"
+    mode: 0644
 
-- name: Enable pathagar
-  file: path=/etc/apache2/sites-enabled/pathagar.conf
-        src=/etc/apache2/sites-available/pathagar.conf
-        state=link
+- name: Enable Pathagar (debuntu)
+  file:
+    path: /etc/apache2/sites-enabled/pathagar.conf
+    src: /etc/apache2/sites-available/pathagar.conf
+    state: link
   when: pathagar_enabled and is_debuntu
 
-- name: Disable pathagar
-  file: path=/etc/apache2/sites-enabled/pathagar.conf
-        state=absent
+- name: Disable Pathagar (debuntu)
+  file:
+    path: /etc/apache2/sites-enabled/pathagar.conf
+    state: absent
   when: not pathagar_enabled and is_debuntu
 
 - name: Restart http
-  service: name={{ apache_service }}
-           state=reloaded
+  service:
+    name: "{{ apache_service }}"
+    state: reloaded
 
 - name: add pathagar to service list
-  ini_file: dest='{{ service_filelist }}'
-            section=pathagar
-            option='{{ item.option }}'
-            value='{{ item.value }}'
+  ini_file:
+    dest: "{{ service_filelist }}"
+    section: pathagar
+    option: "{{ item.option }}"
+    value: "{{ item.value }}"
   with_items:
     - option: name
       value: pathagar