diff --git a/LuaUUThesis.cls b/LuaUUThesis.cls
index 10f3c3e..36d3159 100644
--- a/LuaUUThesis.cls
+++ b/LuaUUThesis.cls
@@ -21,7 +21,7 @@
 
 % Paper resizing commands
 \providecommand{\UU@setsfivepaper}{
-	\setlength{\paperheight}{242mm} 
+	\setlength{\paperheight}{242mm}
 	\setlength{\paperwidth}{165mm}
 	\setlength{\hoffset}{-1in}
 	\setlength{\voffset}{-1in}
@@ -41,7 +41,7 @@
 }
 
 \providecommand{\UU@setafourpaper}{
-	\setlength{\paperheight}{297mm} 
+	\setlength{\paperheight}{297mm}
 	\setlength{\paperwidth}{210mm}
 	\setlength{\hoffset}{-1in}
 	\setlength{\voffset}{-1in}
@@ -60,7 +60,7 @@
 	\special{papersize=297mm,210mm}
 }
 \providecommand{\UU@setafivepaper}{
-	\setlength{\paperheight}{210mm} 
+	\setlength{\paperheight}{210mm}
 	\setlength{\paperwidth}{148mm}
 	\setlength{\hoffset}{-1in}
 	\setlength{\voffset}{-1in}
@@ -78,7 +78,7 @@
 	\setlength{\pdfpageheight}{\paperheight}
 }
 \providecommand{\UU@setbfivepaper}{
-	\setlength{\paperheight}{250mm} 
+	\setlength{\paperheight}{250mm}
 	\setlength{\paperwidth}{176mm}
 	\setlength{\hoffset}{-1in}
 	\setlength{\voffset}{-1in}
@@ -100,42 +100,42 @@
 \let\UU@papersize\UU@setsfivepaper
 
 
-\DeclareOption{s5paper}{ 
+\DeclareOption{s5paper}{
 	\let\UU@papersize\UU@setsfivepaper
 }
 
-\DeclareOption{a4paper}{ 
+\DeclareOption{a4paper}{
 	\PassOptionsToClass{\CurrentOption}{book}
 	\PassOptionsToPackage{\CurrentOption}{geometry}
 	\PassOptionsToPackage{\CurrentOption}{hyperref}
 	\let\UU@papersize\UU@setafourpaper
 }
-\DeclareOption{a5paper}{ 
+\DeclareOption{a5paper}{
 	\PassOptionsToClass{\CurrentOption}{book}
 	\PassOptionsToPackage{\CurrentOption}{geometry}
 	\PassOptionsToPackage{\CurrentOption}{hyperref}
 	\@sfivepaperfalse
 	\let\UU@papersize\UU@setafivepaper
 }
-\DeclareOption{b5paper}{ 
+\DeclareOption{b5paper}{
 	\PassOptionsToClass{\CurrentOption}{book}
 	\PassOptionsToPackage{\CurrentOption}{geometry}
 	\PassOptionsToPackage{\CurrentOption}{hyperref}
 	\let\UU@papersize\UU@setbfivepaper
 }
-\DeclareOption{letterpaper}{ 
+\DeclareOption{letterpaper}{
 	\ClassWarning{Invalid papersize \CurrentOption}
 }
-\DeclareOption{legalpaper}{ 
+\DeclareOption{legalpaper}{
 	\ClassWarning{Invalid papersize \CurrentOption}
 }
-\DeclareOption{titles}{ 
+\DeclareOption{titles}{
 	\@culumntitlestrue
 }
-\DeclareOption{margnum}{ 
+\DeclareOption{margnum}{
 	\@UU@margnumtrue
 }
-\DeclareOption{twocolumn}{ 
+\DeclareOption{twocolumn}{
 	\ClassWarning{This class does not support \CurrentOption}
 }
 \DeclareOption{swedish}{ \PassOptionsToPackage{\CurrentOption}{babel} }
@@ -287,7 +287,7 @@
 %             Page layout
 % ============================================
 
-% Plain - Empty header with page number outer end of footer 
+% Plain - Empty header with page number outer end of footer
 \renewcommand{\ps@plain}{%
 	\let\@oddhead\@empty%
 	\let\@evenhead\@empty%
@@ -311,10 +311,10 @@
 	\def\sectionmark ##1{\markright {\ifnum \c@secnumdepth >\z@ \thesection~~\fi ##1}}%
 }
 
-\let\@oddfoot\@empty 
-\let\@evenfoot\@empty 
-\let\@mkboth\@gobbletwo 
-\let\chaptermark\@gobble 
+\let\@oddfoot\@empty
+\let\@evenfoot\@empty
+\let\@mkboth\@gobbletwo
+\let\chaptermark\@gobble
 \let\sectionmark\@gobble
 \def\appendixmark#1{%
 	\markboth{Appendix \theappendix}{}%
@@ -324,13 +324,16 @@
 	\pagestyle{plain}
 }
 
+%% Why is the UU class redefining the cleardoublepage command?
+%% I don't see what could be the reason... /TA
+%% Commented out or not, I saw no difference. Pls remove on next commit. /TA
 % Adjust to odd pagenumber using an optional blank page
-\let\origdoublepage\cleardoublepage
-\newcommand{\clearemptydoublepage}{%
-  \clearpage
-  {\pagestyle{empty}\origdoublepage}%
-}
-\let\cleardoublepage\clearemptydoublepage
+% \let\origdoublepage\cleardoublepage
+% \newcommand{\clearemptydoublepage}{%
+%   \clearpage
+%   {\pagestyle{empty}\origdoublepage}%
+% }
+% \let\cleardoublepage\clearemptydoublepage
 
 
 % ============================================
@@ -346,20 +349,20 @@
 
 % Remove page numbers and numbering of headings
 \let\oldfrontmatter\frontmatter
-\renewcommand{\frontmatter}{% 
-	\renewcommand{\thepage}{\roman{page}}% 
-	\setcounter{secnumdepth}{-2} % 
-	\@mainmatterfalse% 
-	\pagestyle{empty}% 
+\renewcommand{\frontmatter}{%
+	\renewcommand{\thepage}{\roman{page}}%
+	\setcounter{secnumdepth}{-2} %
+	\@mainmatterfalse%
+	\pagestyle{empty}%
 }
 
 % Adjust to odd page and restore numbering of headings
 \let\oldmainmatter\mainmatter
-	\renewcommand{\mainmatter}{% 
-	\cleardoublepage% 
-	\renewcommand{\thepage}{\arabic{page}}% 
-	\setcounter{secnumdepth}{\c@secnumdepthmainmatter} % 
-	\@mainmattertrue% 
+	\renewcommand{\mainmatter}{%
+	\cleardoublepage%
+	\renewcommand{\thepage}{\arabic{page}}%
+	\setcounter{secnumdepth}{\c@secnumdepthmainmatter} %
+	\@mainmattertrue%
 	\if@culumntitles%
 		\pagestyle{headings}%
 	\else%
@@ -369,20 +372,20 @@
 
 % Remove page numbers and numbering of headings
 \let\oldbackmatter\backmatter
-\renewcommand{\backmatter}{% 
-	\oldbackmatter% 
+\renewcommand{\backmatter}{%
+	\oldbackmatter%
 	\setcounter{secnumdepth}{-2}
 	\makeatletter%
 	\ifx\toclevel@chapter\undefined\else%
 		\renewcommand{\toclevel@appendix}{-1}%
 		\renewcommand{\toclevel@chapter}{-1}%
-		\renewcommand{\toclevel@section}{0}% 
-		\renewcommand{\toclevel@subsection}{1}% 
-		\renewcommand{\toclevel@subsubsection}{2}% 
-		\renewcommand{\toclevel@paragraph}{3}% 
-		\renewcommand{\toclevel@subparagraph}{4}% 
+		\renewcommand{\toclevel@section}{0}%
+		\renewcommand{\toclevel@subsection}{1}%
+		\renewcommand{\toclevel@subsubsection}{2}%
+		\renewcommand{\toclevel@paragraph}{3}%
+		\renewcommand{\toclevel@subparagraph}{4}%
 	\fi%
-	\makeatother% 
+	\makeatother%
 }
 
 % Change the chapter command to create appendixes
@@ -393,7 +396,7 @@
 	\let\chaptername\appendixname%
 	\@mainmattertrue%
 }{%
-} 
+}
 
 
 % ============================================
@@ -404,11 +407,11 @@
 \providecommand{\toclevel@part}{-1}
 \providecommand{\toclevel@appendix}{0}%
 \providecommand{\toclevel@chapter}{0}%
-\providecommand{\toclevel@section}{1}% 
-\providecommand{\toclevel@subsection}{2}% 
-\providecommand{\toclevel@subsubsection}{3}% 
-\providecommand{\toclevel@paragraph}{4}% 
-\providecommand{\toclevel@subparagraph}{5}% 
+\providecommand{\toclevel@section}{1}%
+\providecommand{\toclevel@subsection}{2}%
+\providecommand{\toclevel@subsubsection}{3}%
+\providecommand{\toclevel@paragraph}{4}%
+\providecommand{\toclevel@subparagraph}{5}%
 
 \providecommand{\numberingdepth}[1]{%
    \setcounter{secnumdepth}{\csname toclevel@#1\endcsname}%
@@ -716,7 +719,7 @@
 		\def\longtable{\small\par\olongtable}%
 		\g@addto@macro\endlongtable{\addvspace{0pt plus 13pt}\normalsize}%
 		\let\oLT@array\LT@array%
-	\def\LT@array[#1]#2{% 
+	\def\LT@array[#1]#2{%
 	\oLT@array[#1]{#2}%
 	\hline \multicolumn{\LT@cols}{r@{}}{{\continuednextpage}} %
 	\endfoot}%
@@ -889,7 +892,7 @@
 \renewcommand*\l@subsubsection[2]{\@nopagebreaktoc{4}\customtocline{#1}{#2}{\tocindent@subsubsection}{\tocnumindent@subsubsection}{2}}
 \renewcommand*\l@paragraph[2]{\@nopagebreaktoc{4}\customtocline{#1}{#2}{\tocindent@paragraph}{\tocnumindent@paragraph}{3}}
 \renewcommand*\l@subparagraph[2]{\nopagebreak[1]\@nopagebreaktoc{5}\customtocline{#1}{#2}{\tocindent@subparagraph}{\tocnumindent@subparagraph}{4}}
-\setcounter{tocdepth}{2} 
+\setcounter{tocdepth}{2}
 
 \newcommand*\l@appendix[2]{%
 	\@nopagebreaktoc{0}
@@ -966,13 +969,13 @@
 
 \providecommand{\listofpapersintro}[1]{\gdef\@listofpapersintro{#1}}
 \providecommand{\listofpapersoutro}[1]{\gdef\@listofpapersoutro{#1}}
-\listofpapersintro{This thesis is based on the following papers, which are referred to in the text by their roman numerals.}% 
+\listofpapersintro{This thesis is based on the following papers, which are referred to in the text by their roman numerals.}%
 \listofpapersoutro{Reprints were made with permission from the publishers.}
 
 \providecommand{\pgs@language@swedish}{%
 	\renewcommand{\bibname}{\refname}%
-	\renewcommand{\listofpapersname}{Lista \"over delarbeten}% 
-	\listofpapersintro{Denna avhandling \"ar baserad p\r{a} f\"oljande artiklar, vilka i texten h\"anvisas till med romerska siffror.}% 
+	\renewcommand{\listofpapersname}{Lista \"over delarbeten}%
+	\listofpapersintro{Denna avhandling \"ar baserad p\r{a} f\"oljande artiklar, vilka i texten h\"anvisas till med romerska siffror.}%
 	\listofpapersoutro{Reproduktion med tillst\aa nd fr\aa n respektive utgivare.}%
 	\renewcommand{\continuednextpage}{Fortsatt p\r{a} n\"a{}sta sida}%
 	\renewcommand{\keywordsname}{Nyckelord}%
@@ -1037,7 +1040,7 @@
 \providecommand{\listofcontributionsname}{Other publications}
 \providecommand{\listofcontributionsintro}[1]{\gdef\@listofcontributionsintro{#1}}
 \providecommand{\listofcontributionsoutro}[1]{\gdef\@listofcontributionsoutro{#1}}
-\listofcontributionsintro{Other publications or contributions, not included in the thesis, but referred to in the summary.}% 
+\listofcontributionsintro{Other publications or contributions, not included in the thesis, but referred to in the summary.}%
 \listofcontributionsoutro{Contributions listed above.}
 
 \providecommand{\pgs@language@swedish}{%