diff --git a/contents.tex b/contents.tex
index bdf109420ba31745f4dbd709a533d073c3352b15..2bb3ec94dfe5d80adf80354a6d22abaa51b0e382 100644
--- a/contents.tex
+++ b/contents.tex
@@ -50,8 +50,8 @@ Im Wurzelverzeichnis finden Sie ein \texttt{Makefile}.
 \section{Bilder und Co.}
 
 \subsection{Bilder}%
-
 \label{sec:figures}
+
 \begin{figure}[h]
   \includegraphics[width=4cm]{img/the.png}
   \caption{Initial thesis draft.}%
diff --git a/hhuthesis.cls b/hhuthesis.cls
index cea2a602ff1081fee1fe7ee28c13e06d6f33188a..de59da1ab04c8b2341c5953cc18424caae3366cf 100644
--- a/hhuthesis.cls
+++ b/hhuthesis.cls
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{hhuthesis}[2019/09/04 HHU Thesis LaTeX document class v1.0.0]
+\ProvidesClass{hhuthesis}[2019/09/04 HHU Thesis LaTeX document class v1.1.0]
 
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} % Options fallback.
 \ProcessOptions\relax
@@ -49,6 +49,8 @@
 \RequirePackage{helvet}
 \renewcommand{\familydefault}{\sfdefault}
 
+\pagestyle{headings}
+
 \setlength{\textwidth}{15cm}
 
 \setlength{\oddsidemargin}{35mm}
@@ -78,7 +80,7 @@
 
 \RequirePackage{graphicx}
 
-\newcommand\@maketitle{%
+\newcommand{\@makeheader}{
   %% "Header"
   \vspace*{-5.5cm}
   \hspace{-1cm}
@@ -99,7 +101,9 @@
       {\scriptsize Universit\"atsstr. 1 \hspace{7mm} D--40225 D\"usseldorf}
     \end{center}
   \end{minipage}
-  %% Actual title
+}
+
+\newcommand\@maketitle{%
   \vspace{3cm}
   \begin{center}
     {\LARGE \textbf \@title \par}%
@@ -125,6 +129,7 @@
       \let\footnote\thanks
       \null\vfil
       \vskip 60\p@
+      \@makeheader
       \@maketitle
       \@thanks
       \vfil\null
@@ -147,6 +152,7 @@
   }
 \else
   \renewcommand\maketitle{\par
+    \@makeheader
     \begingroup
       \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
       \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
@@ -319,3 +325,26 @@
       \fi}
       {\if@twocolumn\else\endquotation\fi}
 \fi
+
+
+%%% Simple command to set up frontmatter
+
+\newcommand{\makefrontmatter}{
+  \maketitle
+  \cleardoublepage
+
+  \makedeclaration % Declaration of Authorship
+  \cleardoublepage
+
+  \begin{abstract}
+    \input{abstract.tex}
+  \end{abstract}
+  \cleardoublepage
+
+  \ifacknowledgements % Only show if \showacknowledgements was set above
+    \begin{acknowledgements}
+      \input{acknowledgements.tex}
+    \end{acknowledgements}
+  \fi
+  \cleardoublepage
+}
diff --git a/thesis.tex b/thesis.tex
index 87708699289e94f11bb97772c0c6b1346cbdb182..cde687bc5a617b8ae658ab54f8ceecb06ac4c088 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -169,37 +169,20 @@
 
 \begin{document}
 \frontmatter
-\pagestyle{headings}
-
-\maketitle
-
-\cleardoublepage
-
-\makedeclaration % Declaration of Authorship
-
-\cleardoublepage
-
-\begin{abstract}
-  \input{abstract.tex}
-\end{abstract}
-
-\cleardoublepage
-
-\ifacknowledgements % Only show if \showacknowledgements was set above
-  \begin{acknowledgements}
-    \input{acknowledgements.tex}
-  \end{acknowledgements}
-\fi
-
-\cleardoublepage
+%% Set up title page, declaration of authorship, abstract, acknowledgements
+\makefrontmatter
 
 \tableofcontents
-\cleardoublepage
 
 \mainmatter
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Der Inhalt der Arbeit                                                      %%
+%%                                                                            %%
+%% Hier können Sie die schriftliche Ausarbeitung ihrer Arbeit                 %%
+%% niederschreiben. Der Übersichthalber bietet sich jedoch an, dies in einer  %%
+%% oder mehreren separaten Dateien zu tun, welche mittels \input eingebunden  %%
+%% werden --- wie auch in der Vorlage geschieht.                              %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \input{contents.tex}