diff --git a/module/custom/ui/browsestoryconcept.html.php b/module/custom/ui/browsestoryconcept.html.php
index 4cf82a5d9c..e9a4ff3ac3 100644
--- a/module/custom/ui/browsestoryconcept.html.php
+++ b/module/custom/ui/browsestoryconcept.html.php
@@ -34,14 +34,14 @@ div
             ),
             toolbar
             (
-                !empty($createItem) ? item(set($createItem)) : null,
-            ),
+                !empty($createItem) ? item(set($createItem)) : null
+            )
         ),
         dtable
         (
             set::cols($config->custom->browseStoryConcept->dtable->fieldList),
             set::data($tableData),
-            set::onRenderCell(jsRaw('window.renderCell')),
+            set::onRenderCell(jsRaw('window.renderCell'))
         )
     )
 );
diff --git a/module/custom/ui/code.html.php b/module/custom/ui/code.html.php
index 581aa8be3a..273a2caea2 100644
--- a/module/custom/ui/code.html.php
+++ b/module/custom/ui/code.html.php
@@ -24,8 +24,8 @@ formPanel
                 set::name('code'),
                 set::items($lang->custom->conceptOptions->URAndSR),
                 set::value(isset($config->setCode) ? $config->setCode : 0),
-                set::inline(true),
-            ),
+                set::inline(true)
+            )
         )
     ),
     formRow
diff --git a/module/custom/ui/editstoryconcept.html.php b/module/custom/ui/editstoryconcept.html.php
index 4140c4722e..adf87c0c2b 100644
--- a/module/custom/ui/editstoryconcept.html.php
+++ b/module/custom/ui/editstoryconcept.html.php
@@ -35,7 +35,7 @@ formPanel
                 setClass('article-h2'),
                 $lang->custom->SRConcept
             )
-        ),
+        )
     ),
     formRow
     (
@@ -45,14 +45,14 @@ formPanel
             setClass(!$this->config->URAndSR ? 'hidden' : ''),
             set::width('1/2'),
             set::name('URName'),
-            set::value($URSR->URName),
+            set::value($URSR->URName)
         ),
         formGroup
         (
             set::width('1/2'),
             set::name('SRName'),
-            set::value($URSR->SRName),
-        ),
+            set::value($URSR->SRName)
+        )
     )
 );
 
diff --git a/module/custom/ui/execution.html.php b/module/custom/ui/execution.html.php
index 794c9375df..02a3f8d8b8 100644
--- a/module/custom/ui/execution.html.php
+++ b/module/custom/ui/execution.html.php
@@ -36,8 +36,8 @@ div
                 set::name('execution'),
                 set::items($lang->custom->CRExecution),
                 set::value(isset($config->CRExecution) ? $config->CRExecution : 0),
-                set::inline(true),
-            ),
+                set::inline(true)
+            )
         ),
         formGroup
         (
@@ -48,7 +48,7 @@ div
                 $lang->custom->notice->readOnlyOfExecution
             )
         )
-    ),
+    )
 );
 
 /* ====== Render page ====== */
diff --git a/module/custom/ui/flow.html.php b/module/custom/ui/flow.html.php
index 4ab86621df..4c79247896 100644
--- a/module/custom/ui/flow.html.php
+++ b/module/custom/ui/flow.html.php
@@ -34,14 +34,14 @@ formPanel
             set::name('sprintConcept'),
             set::items($lang->custom->sprintConceptList),
             set::value(zget($this->config->custom, 'sprintConcept', '0')),
-            set::inline(true),
+            set::inline(true)
         )
     ),
     formGroup
     (
         set::label('2.'),
         setClass('items-center'),
-        span($lang->custom->conceptQuestions['storypoint']),
+        span($lang->custom->conceptQuestions['storypoint'])
     ),
     formGroup
     (
@@ -51,9 +51,9 @@ formPanel
             set::name('hourPoint'),
             set::items($lang->custom->conceptOptions->hourPoint),
             set::value(zget($this->config->custom, 'hourPoint')),
-            set::inline(true),
+            set::inline(true)
         )
-    ),
+    )
 );
 
 /* ====== Render page ====== */
diff --git a/module/custom/ui/hours.html.php b/module/custom/ui/hours.html.php
index 4258abcb43..2a50c6e2d9 100644
--- a/module/custom/ui/hours.html.php
+++ b/module/custom/ui/hours.html.php
@@ -30,7 +30,7 @@ div
             set::label($lang->custom->workingHours),
             set::width('1/3'),
             set::name('defaultWorkhours'),
-            set::value($workhours),
+            set::value($workhours)
         ),
         formGroup
         (
@@ -42,7 +42,7 @@ div
                 set::name('weekend'),
                 set::items($lang->custom->weekendList),
                 set::value($weekend),
-                set::inline(true),
+                set::inline(true)
             )
         ),
         formGroup
@@ -56,11 +56,11 @@ div
                 set::name('restDay'),
                 set::items($lang->custom->restDayList),
                 set::value($restDay),
-                set::required(true),
+                set::required(true)
             )
         ),
-        formHidden('type', $type),
-    ),
+        formHidden('type', $type)
+    )
 );
 
 /* ====== Render page ====== */
diff --git a/module/custom/ui/kanban.html.php b/module/custom/ui/kanban.html.php
index 967e7b9f9b..c0c7fa605c 100644
--- a/module/custom/ui/kanban.html.php
+++ b/module/custom/ui/kanban.html.php
@@ -27,8 +27,8 @@ div
                 set::name('kanban'),
                 set::items($lang->custom->CRKanban),
                 set::value(isset($config->CRKanban) ? $config->CRKanban : 0),
-                set::inline(true),
-            ),
+                set::inline(true)
+            )
         ),
         formGroup
         (
@@ -39,5 +39,5 @@ div
                 $lang->custom->notice->readOnlyOfKanban
             )
         )
-    ),
+    )
 );
diff --git a/module/custom/ui/limittaskdate.html.php b/module/custom/ui/limittaskdate.html.php
index d296e1155c..045ff2a3a7 100644
--- a/module/custom/ui/limittaskdate.html.php
+++ b/module/custom/ui/limittaskdate.html.php
@@ -35,10 +35,10 @@ div
                 set::name('limitTaskDate'),
                 set::items($lang->custom->limitTaskDate),
                 set::value(isset($config->limitTaskDate) ? $config->limitTaskDate : 0),
-                set::inline(true),
-            ),
-        ),
-    ),
+                set::inline(true)
+            )
+        )
+    )
 );
 
 /* ====== Render page ====== */
diff --git a/module/custom/ui/mode.html.php b/module/custom/ui/mode.html.php
index 6770830b3d..e4bfa3bee3 100644
--- a/module/custom/ui/mode.html.php
+++ b/module/custom/ui/mode.html.php
@@ -23,7 +23,7 @@ foreach($disabledFeatures as $feature)
         setClass('text-center'),
         h::td(setClass('text-left'), (is_array($feature) && !empty($disabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $this->lang->custom->features[$feature]),
         h::td(setClass('text-center'), icon(setClass('text-danger'), 'ban-circle')),
-        h::td(setClass('text-center'), icon(setClass('text-success'), 'check')),
+        h::td(setClass('text-center'), icon(setClass('text-success'), 'check'))
     );
 }
 foreach($config->custom->allFeatures as $feature)
@@ -36,7 +36,7 @@ foreach($config->custom->allFeatures as $feature)
         setClass('text-center'),
         h::td(setClass('text-left'), ($feature == 'scrumDetail' and !empty($enabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $enabledScrumFeatures)) : $this->lang->custom->features[$feature]),
         h::td(setClass('text-center'), icon(setClass('text-success'), 'check')),
-        h::td(setClass('text-center'), icon(setClass('text-success'), 'check')),
+        h::td(setClass('text-center'), icon(setClass('text-success'), 'check'))
     );
 }
 
@@ -54,7 +54,7 @@ formPanel
             (
                 h::th($lang->custom->mode),
                 h::th(setClass('text-center'), $lang->custom->modeList['light']),
-                h::th(setClass('text-center'), $lang->custom->modeList['ALM']),
+                h::th(setClass('text-center'), $lang->custom->modeList['ALM'])
             )
         ),
         h::tbody
@@ -63,7 +63,7 @@ formPanel
             (
                 h::td($lang->custom->usage),
                 h::td(setClass('text-center'), $lang->custom->modeIntroductionList['light']),
-                h::td(setClass('text-center'), $lang->custom->modeIntroductionList['ALM']),
+                h::td(setClass('text-center'), $lang->custom->modeIntroductionList['ALM'])
             ),
             $featureItems,
             h::tr
@@ -83,17 +83,17 @@ formPanel
                         $mode == 'light' ? set('disabled', true) : null, 
                         set('onclick', 'saveMode(this)'), 
                         $lang->custom->useLight
-                    ),
+                    )
                 ),
                 h::td
                 (
                     $mode == 'ALM' ? set::title($currentModeTips) : null,
                     btn(setID('useALM'), setClass('primary wide'), set('data-mode', 'ALM'), $mode == 'ALM' ? set::disabled(true) : null, set('onclick', 'saveMode(this)'), $lang->custom->useALM),
-                    formHidden('mode', $mode),
-                ),
-            ),
-        ),
-    ),
+                    formHidden('mode', $mode)
+                )
+            )
+        )
+    )
 );
 
 modal
@@ -105,7 +105,7 @@ modal
     (
         div(setClass('alert secondary-pale'), $lang->custom->selectProgramTips),
         formGroup(set::label($lang->custom->defaultProgram), picker(setID('program'), set::name('program'), set::items($programs), set::value($programID))),
-        set::actions(array(array('text' => $lang->save, 'class' => 'primary btn-save', 'onclick' => 'submitMode(this)'))),
+        set::actions(array(array('text' => $lang->save, 'class' => 'primary btn-save', 'onclick' => 'submitMode(this)')))
     )
 );
 
diff --git a/module/custom/ui/percent.html.php b/module/custom/ui/percent.html.php
index 7d47ed45af..b6dc3ff203 100644
--- a/module/custom/ui/percent.html.php
+++ b/module/custom/ui/percent.html.php
@@ -24,8 +24,8 @@ formPanel
                 set::name('percent'),
                 set::items($lang->custom->conceptOptions->URAndSR),
                 set::value(isset($config->setPercent) ? $config->setPercent : 0),
-                set::inline(true),
-            ),
+                set::inline(true)
+            )
         )
     ),
     formRow
diff --git a/module/custom/ui/product.html.php b/module/custom/ui/product.html.php
index c6073888f7..fdf78404f6 100644
--- a/module/custom/ui/product.html.php
+++ b/module/custom/ui/product.html.php
@@ -36,8 +36,8 @@ div
                 set::name('product'),
                 set::items($lang->custom->CRProduct),
                 set::value(isset($config->CRProduct) ? $config->CRProduct : 0),
-                set::inline(true),
-            ),
+                set::inline(true)
+            )
         ),
         formGroup
         (
@@ -49,7 +49,7 @@ div
                 $lang->custom->notice->readOnlyOfProduct
             )
         )
-    ),
+    )
 );
 
 /* ====== Render page ====== */
diff --git a/module/custom/ui/required.html.php b/module/custom/ui/required.html.php
index 5cac804f93..51bf24743e 100644
--- a/module/custom/ui/required.html.php
+++ b/module/custom/ui/required.html.php
@@ -32,7 +32,7 @@ foreach($requiredFields as $method => $requiredField)
                 set::items($fields),
                 set::value($requiredField),
                 set::multiple(true),
-                set::required(true),
+                set::required(true)
             )
         );
 }
@@ -44,7 +44,7 @@ if(common::hasPriv('custom', 'resetRequired'))
         'url'          => inlink('resetRequired', "module=$module"),
         'text'         => $lang->custom->restore,
         'class'        => 'btn-wide ajax-submit',
-        'data-confirm' => $lang->custom->confirmRestore,
+        'data-confirm' => $lang->custom->confirmRestore
     );
 }
 
diff --git a/module/custom/ui/set.html.php b/module/custom/ui/set.html.php
index d3d9a542db..a0d3cf1544 100644
--- a/module/custom/ui/set.html.php
+++ b/module/custom/ui/set.html.php
@@ -45,7 +45,7 @@ if($module == 'project' && $field == 'unitList')
         set::name('defaultCurrency'),
         set::items($checkedUnitList),
         set::value($defaultCurrency),
-        set::required(true),
+        set::required(true)
     );
     $actionWidth = 'w-full';
 }
@@ -58,7 +58,7 @@ elseif($module == 'story' && $field == 'reviewRules')
         set::name('reviewRules'),
         set::value($reviewRule),
         set::control('radioListInline'),
-        set::items($lang->custom->reviewRules),
+        set::items($lang->custom->reviewRules)
     );
 
     $formItems[] = formGroup
@@ -68,7 +68,7 @@ elseif($module == 'story' && $field == 'reviewRules')
         set::name('superReviewers'),
         set::value($superReviewers),
         set::control(array('type' => 'picker', 'multiple' => true)),
-        set::items($users),
+        set::items($users)
     );
 }
 elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
@@ -81,7 +81,7 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
         set::value($needReview),
         set::control('radioListInline'),
         set::items($lang->custom->reviewList),
-        on::change('changeReview'),
+        on::change('changeReview')
     );
 
     if($module == 'story')
@@ -95,7 +95,7 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                 set::label(''),
                 set::name(''),
                 set::value(sprintf($lang->custom->notice->forceReview, $lang->$module->common) . $lang->custom->notice->storyReviewTip),
-                set::control('static'),
+                set::control('static')
             )
         );
 
@@ -108,7 +108,7 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                 set::label(''),
                 set::name(''),
                 set::value(sprintf($lang->custom->notice->forceNotReview, $lang->$module->common) . $lang->custom->notice->storyReviewTip),
-                set::control('static'),
+                set::control('static')
             )
         );
 
@@ -147,7 +147,7 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                 set::value($forceReviewDepts),
                 set::items($depts),
                 set::control(array('type' => 'picker', 'multiple' => true))
-            ),
+            )
         );
         $formItems[] = div
         (
@@ -160,7 +160,7 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                 set::name('forceNotReview'),
                 set::value($forceNotReview),
                 set::items($users),
-                set::control(array('type' => 'picker', 'multiple' => true)),
+                set::control(array('type' => 'picker', 'multiple' => true))
             ),
             formRow
             (
@@ -172,7 +172,7 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                     set::name('forceNotReviewRoles'),
                     set::value($forceNotReviewRoles),
                     set::items($lang->user->roleList),
-                    set::control(array('type' => 'picker', 'multiple' => true)),
+                    set::control(array('type' => 'picker', 'multiple' => true))
                 )
             ),
             formGroup
@@ -182,7 +182,7 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                 set::name('forceNotReviewDepts'),
                 set::value($forceNotReviewDepts),
                 set::items($depts),
-                set::control(array('type' => 'picker', 'multiple' => true)),
+                set::control(array('type' => 'picker', 'multiple' => true))
             )
         );
     }
@@ -205,14 +205,14 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                     set::name('forceNotReview'),
                     set::value($forceNotReview),
                     set::items($users),
-                    set::control(array('type' => 'picker', 'multiple' => true)),
+                    set::control(array('type' => 'picker', 'multiple' => true))
                 ),
                 icon
                 (
                     'help',
                     setClass('pl-4 pt-2'),
                     set('data-toggle', 'tooltip'),
-                    set('data-title', sprintf($lang->custom->notice->forceNotReview, $lang->$module->common)),
+                    set('data-title', sprintf($lang->custom->notice->forceNotReview, $lang->$module->common))
                 )
             )
         );
@@ -229,14 +229,14 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                     set::name('forceReview'),
                     set::value($forceReview),
                     set::items($users),
-                    set::control(array('type' => 'picker', 'multiple' => true)),
+                    set::control(array('type' => 'picker', 'multiple' => true))
                 ),
                 icon
                 (
                     'help',
                     setClass('pl-4 pt-2'),
                     set('data-toggle', 'tooltip'),
-                    set('data-title', sprintf($lang->custom->notice->forceReview, $lang->$module->common)),
+                    set('data-title', sprintf($lang->custom->notice->forceReview, $lang->$module->common))
                 )
             )
         );
@@ -260,7 +260,7 @@ elseif($module == 'bug' && $field == 'longlife')
         set::width('1/3'),
         set::control(array(
             'type'   => 'inputControl',
-            'suffix' => $lang->day,
+            'suffix' => $lang->day
         ))
     );
 
@@ -283,7 +283,7 @@ elseif($module == 'block' && $field == 'closed')
             set::label($lang->custom->block->fields['closed']),
             set::name('closed'),
             set::value($lang->custom->notice->noClosedBlock),
-            set::control('static'),
+            set::control('static')
         );
         $formActions = array();
     }
@@ -297,7 +297,7 @@ elseif($module == 'block' && $field == 'closed')
             set::value($closedBlock),
             set::control(array(
                 'type'     => 'picker',
-                'multiple' => true,
+                'multiple' => true
             )),
             set::items($blockPairs)
         );
@@ -327,7 +327,7 @@ elseif($module == 'user' && $field == 'contactField')
             'url'          => inlink('restore', "module=user&field=contactField"),
             'text'         => $lang->custom->restore,
             'class'        => 'btn-wide ajax-submit',
-            'data-confirm' => $lang->custom->confirmRestore,
+            'data-confirm' => $lang->custom->confirmRestore
         );
     }
 }
@@ -373,7 +373,7 @@ else
                 (
                     set::width('1/2'),
                     set::label('addRow'),
-                    set::name('values[]'),
+                    set::name('values[]')
                 ),
                 span
                 (
@@ -381,14 +381,14 @@ else
                     (
                         setClass('add-item btn ghost'),
                         on::click('addRow'),
-                        icon('plus'),
+                        icon('plus')
                     ),
                     btn
                     (
                         setClass('del-item btn ghost'),
                         on::click('removeRow'),
-                        icon('trash'),
-                    ),
+                        icon('trash')
+                    )
                 )
             )
         );
@@ -424,15 +424,15 @@ else
                     (
                         setClass('add-item btn ghost'),
                         on::click('addRow'),
-                        icon('plus'),
+                        icon('plus')
                     ),
                     btn
                     (
                         setClass('del-item btn ghost'),
                         on::click('removeRow'),
-                        icon ('trash'),
-                    ),
-                ) : null,
+                        icon ('trash')
+                    )
+                ) : null
             );
         }
 
@@ -447,7 +447,7 @@ else
                 set::name('lang'),
                 set::items($appliedTo),
                 set::value($lang2Set),
-                set::control('radioListInline'),
+                set::control('radioListInline')
             )
         );
 
@@ -457,7 +457,7 @@ else
                 'url'          => inlink('restore', "module={$module}&field={$field}"),
                 'text'         => $lang->custom->restore,
                 'class'        => 'btn-wide ajax-submit',
-                'data-confirm' => $lang->custom->confirmRestore,
+                'data-confirm' => $lang->custom->confirmRestore
             );
         }
 
@@ -490,9 +490,9 @@ div
         span
         (
             setClass('article-h2'),
-            $lang->custom->$module->fields[$field],
+            $lang->custom->$module->fields[$field]
         ),
-        $formItems,
+        $formItems
     )
 );
 
diff --git a/module/custom/ui/setstoryconcept.html.php b/module/custom/ui/setstoryconcept.html.php
index 9cad176581..caf5eae1e8 100644
--- a/module/custom/ui/setstoryconcept.html.php
+++ b/module/custom/ui/setstoryconcept.html.php
@@ -20,14 +20,14 @@ formBatchPanel
     (
         set::width('1/3'),
         set::label($lang->custom->URConcept),
-        set::name('URName'),
+        set::name('URName')
     ) : null,
     formBatchItem
     (
         set::width('1/3'),
         set::label($lang->custom->SRConcept),
-        set::name('SRName'),
-    ),
+        set::name('SRName')
+    )
 );
 
 /* ====== Render page ====== */
diff --git a/module/custom/ui/sidebar.html.php b/module/custom/ui/sidebar.html.php
index 74cdf4e502..c9faa16f37 100644
--- a/module/custom/ui/sidebar.html.php
+++ b/module/custom/ui/sidebar.html.php
@@ -64,7 +64,7 @@ if(!empty($lang->custom->{$module}->fields))
                     (
                         setClass($active),
                         set::href(createLink($currentModule, $method, $params)),
-                        $value,
+                        $value
                     )
                 );
         }
diff --git a/module/custom/ui/timezone.html.php b/module/custom/ui/timezone.html.php
index b878823229..38fe6e5003 100644
--- a/module/custom/ui/timezone.html.php
+++ b/module/custom/ui/timezone.html.php
@@ -39,10 +39,10 @@ else
                 (
                     set::name('timezone'),
                     set::items($timezoneList),
-                    set::value($config->timezone),
+                    set::value($config->timezone)
                 )
             )
-        ),
+        )
     );
 }