diff --git a/src/gui_define_model_settings.m b/src/gui_define_model_settings.m
index 78bf45380504afb75e335b7ada2333dcab736202..c04d7695a7a8d6a8de44f5b27797cbb906423e91 100644
--- a/src/gui_define_model_settings.m
+++ b/src/gui_define_model_settings.m
@@ -28,26 +28,25 @@ function gui_define_model_settings(hObject)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-global project_info
-global model_settings
-global oo_ M_ ex0_
+global project_info model_settings oo_ M_ ex0_
 
-bg_color = char(getappdata(0,'bg_color'));
-special_color = char(getappdata(0,'special_color'));
+bg_color = char(getappdata(0, 'bg_color'));
+special_color = char(getappdata(0, 'special_color'));
 
-dynare_gui_root = getappdata(0, 'dynare_gui_root');
-path = [dynare_gui_root, filesep,'+gui_external', filesep,'tablefilter-swing-5.2.2.jar'];
-javaaddpath(path);
+javaaddpath([getappdata(0, 'dynare_gui_root') filesep '+gui_external' filesep 'tablefilter-swing-5.2.2.jar']);
 
-[tabId, ~] = gui_tabs.add_tab(hObject,  'Model settings');
+tabId = gui_tabs.add_tab(hObject, 'Model settings');
 
 gui_size = gui_tools.get_gui_elements_size(tabId);
 
-uicontrol(tabId,'Style','text',...
-    'String','Define model settings in tabs below:',...
+uicontrol(tabId, ...
+    'Style', 'text', ...
+    'String', 'Define model settings in tabs below:',...
     'FontWeight', 'bold', ...
-    'HorizontalAlignment', 'left','BackgroundColor', bg_color,...
-    'Units','normalized','Position',[0.01 0.92 1 0.05] );
+    'HorizontalAlignment', 'left', ...
+    'BackgroundColor', bg_color,...
+    'Units', 'normalized', ...
+    'Position', [0.01 0.92 1 0.05]);
 
 current_settings.shocks =  model_settings.shocks;
 current_settings.variables = model_settings.variables;
@@ -59,8 +58,9 @@ tab_created_id = [0,0,0];
 panel_id = uipanel( ...
     'Parent', tabId, ...
     'Tag', 'uipanelSettings', ...
-    'BackgroundColor', special_color,...
-    'Units', 'normalized', 'Position', [0 0.09 1 0.82], ...
+    'BackgroundColor', special_color, ...
+    'Units', 'normalized', ...
+    'Position', [0 0.09 1 0.82], ...
     'Title', '', ...
     'BorderType', 'none');
 
@@ -149,15 +149,16 @@ uicontrol(tabId, 'Style','pushbutton','String','Close this tab','Units','normali
 
             column_names = {' Name ',' LaTeX name ', ' Long name ', ' Current value ', column_name, ' STD ', ' Show/Hide ', ' Group (tab) name ',' Show/Hide group ', ' Rename group '};
             column_format = {'char','char','char','numeric' , 'numeric','numeric','logical', 'char','logical','char'};
-            uit = uitable(tabId,'Data',data,...
-                'Units','normalized',...% 'Units','characters',...normalized
+            uit = uitable(tabId, ...
+                'Data', data, ...
+                'Units','normalized', ...
                 'ColumnName', column_names,...
                 'ColumnFormat', column_format,...
                 'ColumnEditable', [ false true true true false false true true true true],...
                 'ColumnWidth', {'auto', 'auto', 150,'auto','auto','auto','auto', 'auto', 'auto', 'auto'}, ...
-                'RowName',[],...
-                'Position',[0 0.5 1 0.5],...
-                'CellEditCallback',@savedata);
+                'RowName', [], ...
+                'Position', [0 0.5 1 0.5],...
+                'CellEditCallback', @savedata);
 
             num_shocks = size(data_corr,1);
             for j=1:num_shocks
@@ -172,15 +173,16 @@ uicontrol(tabId, 'Style','pushbutton','String','Close this tab','Units','normali
                 'HorizontalAlignment', 'left','BackgroundColor', special_color,...
                 'Units','normalized','Position',[0.01,0.45,.98,0.05]);% 'Units','characters','Position',[1 12 50 1] );
 
-            uitable(tabId,'Data',data_corr,...
-                'Units','normalized',...
-                'ColumnName', corr_names,...
-                'ColumnFormat', corr_format,...
-                'ColumnEditable', corr_editable,...
+            uitable(tabId, ...
+                'Data', data_corr, ...
+                'Units', 'normalized', ...
+                'ColumnName', corr_names, ...
+                'ColumnFormat', corr_format, ...
+                'ColumnEditable', corr_editable, ...
                 'ColumnWidth', corr_width, ...
-                'RowName',corr_names,...
-                'Position',[0 0 1 0.5],...
-                'CellEditCallback',@savecorrdata);
+                'RowName', corr_names, ...
+                'Position', [0 0 1 0.5], ...
+                'CellEditCallback', @savecorrdata);
 
         else % deterministic case
             for ii = 1:M_.exo_nbr
@@ -191,15 +193,16 @@ uicontrol(tabId, 'Style','pushbutton','String','Close this tab','Units','normali
 
             column_names = {' Name ',' LaTeX name ', ' Long name ', ' initval ', ' Show/Hide ', ' Group (tab) name ',' Show/Hide group ', ' Rename group '};
             column_format = {'char','char','char','numeric' , 'logical', 'char','logical','char'};
-            uit = uitable(tabId,'Data',data,...
-                'Units','normalized',...
-                'ColumnName', column_names,...
-                'ColumnFormat', column_format,...
+            uit = uitable(tabId, ...
+                'Data', data, ...
+                'Units', 'normalized', ...
+                'ColumnName', column_names, ...
+                'ColumnFormat', column_format, ...
                 'ColumnEditable', [false true true true true true true true],...
                 'ColumnWidth', {'auto', 'auto', 150, 'auto','auto','auto','auto', 'auto'}, ...
-                'RowName',[],...
-                'Position',[0 0 1 1],...
-                'CellEditCallback',@savedata);
+                'RowName', [], ...
+                'Position', [0 0 1 1], ...
+                'CellEditCallback', @savedata);
         end
         tab_created_id(3) = 1;
 
@@ -320,9 +323,7 @@ uicontrol(tabId, 'Style','pushbutton','String','Close this tab','Units','normali
                 set(uit,'data',t_data);
                 %jtable.getRowSorter.setRowFilter(current_filter);
             end
-
         end
-
     end
 
     function gui_params(tabId, data)
@@ -402,7 +403,6 @@ uicontrol(tabId, 'Style','pushbutton','String','Close this tab','Units','normali
                 c_rename_group = 8;
             end
 
-
             if c == c_show_hide_group
                 t_data=get(uit,'data');
                 group_name = t_data{r,c_group_name};