diff --git a/roles/ide_goland/tasks/main.yml b/roles/ide_goland/tasks/main.yml
index a72e1df..c81b811 100644
--- a/roles/ide_goland/tasks/main.yml
+++ b/roles/ide_goland/tasks/main.yml
@@ -3,44 +3,44 @@
 - name: Check opt artifacts exist
   stat:
     path: "/opt/goland-{{ goland_version }}"
-  register: goland_artifacts
+  register: goland_artifacts_flag
 
 - name: Download
   get_url:
     url: http://download.jetbrains.com/go/goland-{{ goland_version }}.tar.gz
     dest: /opt/goland-{{ goland_version }}.tar.gz
-  when: goland_artifacts.stat.exists == False
+  when: goland_artifacts_flag.stat.exists == False
 
 - name: Create folder
   file:
     path: /opt/goland-{{ goland_version }}
     state: directory
-  when: goland_artifacts.stat.exists == False
+  when: goland_artifacts_flag.stat.exists == False
 
 - name: Decompress
   unarchive:
     src: /opt/goland-{{ goland_version }}.tar.gz
     dest: /opt/goland-{{ goland_version }}
     extra_opts: [ --strip-component=1 ]
-  when: goland_artifacts.stat.exists == False
+  when: goland_artifacts_flag.stat.exists == False
+
+
+- name: Check binary exist
+  stat:
+    path: "{{ goland_bin }}"
+  register: goland_bin_flag
 
 - name: Create symlink
   file:
     src: /opt/goland-{{ goland_version }}/bin/goland.sh
     dest: "{{ goland_bin }}"
     state: link
-  when: goland_bin.stat.exists == False
-
-
-- name: Check binary exist
-  stat:
-    path: "{{ goland_bin }}"
-  register: goland_bin
+  when: goland_bin_flag.stat.exists == False
 
 - name: Remove archive
   shell: rm -r /opt/goland-{{ goland_version }}.tar.gz
-  when: goland_version.stat.exists == False
+  when: goland_bin_flag.stat.exists == False
 
 - name: Init start (Create Desktop Entry)
   command: sh {{ goland_bin }}
-  when: goland_bin.stat.exists == False
+  when: goland_bin_flag.stat.exists == False
diff --git a/roles/ide_phpstorm/tasks/main.yml b/roles/ide_phpstorm/tasks/main.yml
index b502dc0..8b3732b 100644
--- a/roles/ide_phpstorm/tasks/main.yml
+++ b/roles/ide_phpstorm/tasks/main.yml
@@ -3,44 +3,44 @@
 - name: Check opt artifacts exist
   stat:
     path: "/opt/phpstorm-{{ phpstorm_version }}"
-  register: phpstorm_artifacts
+  register: phpstorm_artifacts_flag
 
 - name: Download
   get_url:
     url: http://download.jetbrains.com/webide/PhpStorm-{{ phpstorm_version }}.tar.gz
     dest: /opt/phpstorm-{{ phpstorm_version }}.tar.gz
-  when: phpstorm_artifacts.stat.exists == False
+  when: phpstorm_artifacts_flag.stat.exists == False
 
 - name: Create folder
   file:
     path: /opt/phpstorm-{{ phpstorm_version }}
     state: directory
-  when: phpstorm_artifacts.stat.exists == False
+  when: phpstorm_artifacts_flag.stat.exists == False
 
 - name: Decompress
   unarchive:
     src: /opt/phpstorm-{{ phpstorm_version }}.tar.gz
     dest: /opt/phpstorm-{{ phpstorm_version }}
     extra_opts: [ --strip-component=1 ]
-  when: phpstorm_artifacts.stat.exists == False
+  when: phpstorm_artifacts_flag.stat.exists == False
+
+
+- name: Test if folder exist
+  stat:
+    path: "{{ phpstorm_bin }}"
+  register: phpstorm_bin_flag
 
 - name: Create symlink
   file:
     src: /opt/phpstorm-{{ phpstorm_version }}/bin/phpstorm.sh
     dest: "{{ phpstorm_bin }}"
     state: link
-  when: phpstorm_artifacts.stat.exists == False
-
-
-- name: Test if folder exist
-  stat:
-    path: "{{ phpstorm_bin }}"
-  register: phpstorm_bin
+  when: phpstorm_bin_flag.stat.exists == False
 
 - name: Remove archive
   shell: rm -r /opt/phpstorm-{{ phpstorm_version }}.tar.gz
-  when: phpstorm_bin.stat.exists == False
+  when: phpstorm_bin_flag.stat.exists == False
 
 - name: Init start (Create Desktop Entry)
   command: sh {{ phpstorm_bin }}
-  when: phpstorm_bin.stat.exists == False
+  when: phpstorm_bin_flag.stat.exists == False