diff --git a/format/WZLTemplate_files/SET_Footnotes.tex b/format/WZLTemplate_files/SET_Footnotes.tex
index a7efe030cf428818cf19ca6dff6b37457b553e70..818cb44ebc14557882a1a52be59dbe8aa78c2c38 100644
--- a/format/WZLTemplate_files/SET_Footnotes.tex
+++ b/format/WZLTemplate_files/SET_Footnotes.tex
@@ -3,8 +3,17 @@
 
 %% FOOTNOTES
 \usepackage[hang,flushmargin,]{footmisc} %% Remove indentation of footnotes
+
 \setlength{\skip\footins}{1cm} % footnote margin
 \renewcommand{\footnoterule}{{\color{\chaptercolor}
             \noindent\rule[3pt]{\textwidth}{0.4pt}
         }
+}
+
+% disclaimer footnote
+\newcommand\disclaimer[1]{
+    \begingroup
+    \renewcommand\thefootnote{}\footnote{#1}
+    \addtocounter{footnote}{-1}
+    \endgroup
 }
\ No newline at end of file
diff --git a/format/WZLTemplate_files/SET_Glossaries.tex b/format/WZLTemplate_files/SET_Glossaries.tex
index 0eea9dd67496b35c882dccd2521ff2e8e0f900f5..edddeda7369e545fdc428d1a387acbe18e615f65 100644
--- a/format/WZLTemplate_files/SET_Glossaries.tex
+++ b/format/WZLTemplate_files/SET_Glossaries.tex
@@ -9,5 +9,51 @@
 % Define a custom dotfill for glossaries
 \def\Dotfill{\leavevmode\xleaders\hbox to .8em{\hss.\hss}\hfill\kern0pt}
 \makeglossaries
+
+
+%% List of symbols
+\newglossarystyle{symbols_style}{
+    \setglossarystyle{long3col}
+    \renewenvironment{theglossary}%
+    {\begin{longtable}{
+            @{}p{0.15\textwidth}
+            @{\hspace{6pt}}p{\dimexpr 0.8\textwidth}<{\Dotfill}
+            @{\hspace{6pt}}p{0.05\textwidth}
+            @{}
+            }
+            }%
+            {\end{longtable}}%
+    \renewcommand*{\glossentry}[2]{
+        \glstarget{##1}{\glossentryname{##1}}% the entry name
+        % & (\glossentrysymbol{##1})% the symbol in brackets
+        & \glossentrydesc{##1}% the description 
+        & ##2% the number list in square brackets
+        \\
+    }% 
+}
 \input{format/symbols}
+
+
+%% Glossary
+\newglossarystyle{glossary_style}{
+    % \setglossarystyle{long3col}
+    \setglossarystyle{long}
+    \renewenvironment{theglossary}%
+    {\begin{longtable}
+            {
+            @{}>{\raggedright\arraybackslash}p{0.2\textwidth}
+            @{\hspace{6pt}}p{\dimexpr 0.8\textwidth-6pt}
+            % @{\hspace{6pt}}p{\dimexpr 0.7\textwidth-12pt}
+            % @{\hspace{6pt}}p{0.1\textwidth}
+            @{}
+            }}%
+            {\end{longtable}}%
+    \renewcommand*{\glossentry}[2]{
+        \glstarget{##1}{\glossentryname{##1}}% the entry name
+        % & (\glossentrysymbol{##1})% the symbol in brackets
+        & \glossentrydesc{##1}% the description 
+        % & ##2% the number list in square brackets
+        \\
+    }% 
+}
 \input{format/glossary}
\ No newline at end of file
diff --git a/format/functions.tex b/format/functions.tex
index 2a7d05b257b687c304c9698bc9a56919a8ca84bf..26b7ee1c4b1a65150dffc39d3ce52afaf0733df0 100644
--- a/format/functions.tex
+++ b/format/functions.tex
@@ -48,29 +48,9 @@
 }
 
 
-%% List of symbols
-\newglossarystyle{symbols_style}{
-    \setglossarystyle{long3col}
-    \renewenvironment{theglossary}%
-    {\begin{longtable}{
-            @{}p{0.15\textwidth}
-            @{\hspace{6pt}}p{\dimexpr 0.8\textwidth}<{\Dotfill}
-            @{\hspace{6pt}}p{0.05\textwidth}
-            @{}
-            }
-            }%
-            {\end{longtable}}%
-    \renewcommand*{\glossentry}[2]{
-        \glstarget{##1}{\glossentryname{##1}}% the entry name
-        % & (\glossentrysymbol{##1})% the symbol in brackets
-        & \glossentrydesc{##1}% the description 
-        & ##2% the number list in square brackets
-        \\
-    }% 
-}
 
 
-% TODO
+%% List of Symbols
 \newcommand{\los}{
     \stepcounter{romancounter}
     \newcommand{\listsymbolname}{\Roman{romancounter}\hspace{1em}\tmpsymbolname}
@@ -86,31 +66,7 @@
 }
 
 
-%% Glossary
-\newglossarystyle{glossary_style}{
-    % \setglossarystyle{long3col}
-    \setglossarystyle{long}
-    \renewenvironment{theglossary}%
-    {\begin{longtable}
-            {
-            @{}>{\raggedright\arraybackslash}p{0.2\textwidth}
-            @{\hspace{6pt}}p{\dimexpr 0.8\textwidth-6pt}
-            % @{\hspace{6pt}}p{\dimexpr 0.7\textwidth-12pt}
-            % @{\hspace{6pt}}p{0.1\textwidth}
-            @{}
-            }}%
-            {\end{longtable}}%
-    \renewcommand*{\glossentry}[2]{
-        \glstarget{##1}{\glossentryname{##1}}% the entry name
-        % & (\glossentrysymbol{##1})% the symbol in brackets
-        & \glossentrydesc{##1}% the description 
-        % & ##2% the number list in square brackets
-        \\
-    }% 
-}
-
-
-% TODO
+%% List of Glossary
 \newcommand{\glossarylist}{
     \stepcounter{romancounter}
     \newcommand{\theglossaryname}{\Roman{romancounter}\hspace{1em}\tmpglossaryname}
@@ -188,13 +144,6 @@
 }
 
 
-% disclaimer footnote
-\newcommand\disclaimer[1]{
-    \begingroup
-    \renewcommand\thefootnote{}\footnote{#1}
-    \addtocounter{footnote}{-1}
-    \endgroup
-}
 
 
 % commands for italic acronyms
diff --git a/main.tex b/main.tex
index 7d7117bb6a5099b978bcf7927dd2d36f1b3e9ecf..ca4f559b20bc181ad1e664caf1b49dbb5e0bd867 100644
--- a/main.tex
+++ b/main.tex
@@ -41,7 +41,6 @@
 
 %% Define own commands
 \include{format/functions}
-%\include{format/harveyballs}
 
 %% Set up glossary
 % \input{glossary}