diff --git a/module/my/model.php b/module/my/model.php
index 6808ab9adc..ae7dffbbcc 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -30,13 +30,18 @@ class myModel extends model
             $role = $this->app->user->role;
             if($role == 'qa')
             {
-                unset($this->lang->my->menuOrder[15]);
+                $taskOrder = '15';
+                $bugOrder  = '20';
+
+                unset($this->lang->my->menuOrder[$taskOrder]);
                 $this->lang->my->menuOrder[32] = 'task';
-                $this->lang->my->dividerMenu = str_replace(',task,', ',' . $this->lang->my->menuOrder[20] . ',', $this->lang->my->dividerMenu);
+                $this->lang->my->dividerMenu = str_replace(',task,', ',' . $this->lang->my->menuOrder[$bugOrder] . ',', $this->lang->my->dividerMenu);
             }
             elseif($role == 'po')
             {
-                unset($this->lang->my->menuOrder[29]);
+                $requirementOrder = 29;
+                unset($this->lang->my->menuOrder[$requirementOrder]);
+
                 $this->lang->my->menuOrder[15] = 'story';
                 $this->lang->my->menuOrder[16] = 'requirement';
                 $this->lang->my->menuOrder[30] = 'task';
@@ -44,7 +49,9 @@ class myModel extends model
             }
             elseif($role == 'pm')
             {
-                unset($this->lang->my->menuOrder[35]);
+                $projectOrder = 35;
+                unset($this->lang->my->menuOrder[$projectOrder]);
+
                 $this->lang->my->menuOrder[17] = 'myProject';
             }
         }