diff --git a/template_assignments_maths[English].tex b/template_assignments_maths[English].tex
index f7bdd05..8a0554e 100644
--- a/template_assignments_maths[English].tex
+++ b/template_assignments_maths[English].tex
@@ -1,41 +1,57 @@
+% TEMPLATE ********************************************************************************************************
 \documentclass[a4paper,fontsize=12pt,listof=totoc,toc=sectionentrywithdots]{scrartcl}
+%
+% style packages **************************************************************************************************
+%
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
-
 \usepackage{lmodern}
 \usepackage[onehalfspacing]{setspace}
-
-\usepackage{mathtools}
-\usepackage{amsxtra,amssymb,amsthm,amstext,amsfonts}
-\usepackage{esint} % for circle integrals
-
 \setcounter{secnumdepth}{5} % numbered paragraphs
-\usepackage[hyphens]{url}
-\usepackage[]{hyperref}
 \usepackage{fancyhdr}
-
-\usepackage[extendedchars]{grffile}
-
-\usepackage{xcolor}
-\usepackage{float}
-
-% header and footer
+% page settings ***************************************************************************************************
+%
+% custom commands for title, name and sectioning
 \newcommand{\Assignment}{class name - assignment no. X} % title, for both title and header
 \newcommand{\Task}[1]{ \section*{#1.)} \addcontentsline{toc}{section}{Task #1} \label{sec:task_#1}}
 \newcommand{\Subtask}[1]{ \subsection*{#1)} \addcontentsline{toc}{subsection}{#1 )}}
 \newcommand{\Authorname}{your name here} % your name here
-
+%
 \setlength{\headheight}{15.2pt}
 \pagestyle{fancy}
 \fancyhf{}
-
+%
 \fancyhead[R]{\Authorname}
 \fancyhead[L]{\Assignment}
 \fancyfoot[C]{\thepage}
-
+%
+%
+% math packages ***************************************************************************************************
+%
+\usepackage{mathtools}
+\usepackage{amsxtra,amssymb,amsthm,amstext,amsfonts}
+\usepackage{esint} % for circle integrals
+%
+% optimisation ****************************************************************************************************
+%
+\usepackage{float} % better control of placements
+\usepackage{microtype} % package for optimising typographic details
+\usepackage{booktabs} % optimised display of tables
+\usepackage{tabularx} % more modern display of tables with \toprule,\midrule,\bottomrule
+\usepackage{multirow} % allows table cells over multiple rows within a column
+%
+% misc packages ***************************************************************************************************
+%
+\usepackage[extendedchars]{grffile} % for spaces and special chars in file paths
+\usepackage{xcolor} % adds colours
+\usepackage[hyphens]{url} % adds hyperlinks
+\usepackage[]{hyperref} % adds links to toc
+%
 \title{\Assignment}
 \author{\Authorname}
 \date{\today}
+% document ********************************************************************************************************
+%
 \begin{document}
 \maketitle
 \tableofcontents
diff --git a/template_assignments_maths[German].tex b/template_assignments_maths[German].tex
index 8264953..6606bb7 100644
--- a/template_assignments_maths[German].tex
+++ b/template_assignments_maths[German].tex
@@ -1,41 +1,58 @@
+% TEMPLATE ********************************************************************************************************
 \documentclass[a4paper,fontsize=12pt,listof=totoc,toc=sectionentrywithdots]{scrartcl}
+%
+% style packages **************************************************************************************************
+%
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage[ngerman]{babel} 
 \usepackage{lmodern}
 \usepackage[onehalfspacing]{setspace}
-
-\usepackage{mathtools}
-\usepackage{amsxtra,amssymb,amsthm,amstext,amsfonts}
-\usepackage{esint} % for circle integrals
-
 \setcounter{secnumdepth}{5} % numbered paragraphs
-\usepackage[hyphens]{url}
-\usepackage[]{hyperref}
 \usepackage{fancyhdr}
-
-\usepackage[extendedchars]{grffile}
-
-\usepackage{xcolor}
-\usepackage{float}
-
-% header and footer
+% page settings ***************************************************************************************************
+%
+% custom commands for title, name and sectioning
 \newcommand{\Hausaufgabe}{Modulname - Hausaufgabe Nr. X} % title, for both title and header
 \newcommand{\Aufgabe}[1]{ \section*{#1.)} \addcontentsline{toc}{section}{Aufgabe #1} \label{sec:aufgabe_#1}}
 \newcommand{\Teilaufgabe}[1]{ \subsection*{#1)} \addcontentsline{toc}{subsection}{#1 )}}
 \newcommand{\Autor}{Max Mustermann} % your name here
-
+%
 \setlength{\headheight}{15.2pt}
 \pagestyle{fancy}
 \fancyhf{}
-
+%
 \fancyhead[R]{\Autor}
 \fancyhead[L]{\Hausaufgabe}
 \fancyfoot[C]{\thepage}
-
-\title{\Hausaufgabe}
-\author{\Autor}
+%
+%
+% math packages ***************************************************************************************************
+%
+\usepackage{mathtools}
+\usepackage{amsxtra,amssymb,amsthm,amstext,amsfonts}
+\usepackage{esint} % for circle integrals
+%
+% optimisation ****************************************************************************************************
+%
+\usepackage{float} % better control of placements
+\usepackage{microtype} % package for optimising typographic details
+\usepackage{booktabs} % optimised display of tables
+\usepackage{tabularx} % more modern display of tables with \toprule,\midrule,\bottomrule
+\usepackage{multirow} % allows table cells over multiple rows within a column
+%
+% misc packages ***************************************************************************************************
+%
+\usepackage[extendedchars]{grffile} % for spaces and special chars in file paths
+\usepackage{xcolor} % adds colours
+\usepackage[hyphens]{url} % adds hyperlinks
+\usepackage[]{hyperref} % adds links to toc
+%
+\title{\Assignment}
+\author{\Authorname}
 \date{\today}
+% document ********************************************************************************************************
+%
 \begin{document}
 \maketitle
 \tableofcontents