diff --git a/ada-core-cover-letter/closer.tex b/ada-core-cover-letter/closer.tex
new file mode 100644
index 0000000..fe9b636
--- /dev/null
+++ b/ada-core-cover-letter/closer.tex
@@ -0,0 +1,12 @@
+% Closer
+\vspace{0.1in}
+\vfill
+
+\begin{flushright}
+\closer,
+
+\ifthenelse{\boolean{include-signature}}{\vspace{-0.1in}\includegraphics[width=1.5in]{sig.png}\vspace{-0.1in}}{}
+
+\myname\\
+\mytitle
+\end{flushright}
diff --git a/ada-core-cover-letter/header.tex b/ada-core-cover-letter/header.tex
new file mode 100644
index 0000000..bcf00db
--- /dev/null
+++ b/ada-core-cover-letter/header.tex
@@ -0,0 +1,22 @@
+% Shaded header banner
+\AddToShipoutPictureBG{%
+\color{TopBackground}
+\AtPageUpperLeft{\rule[-\shadedheight]{\paperwidth}{\shadedheight}}
+}
+
+% Header
+\begin{center}
+{\fontsize{28}{0}\selectfont\scshape \myname}
+
+\vspace{0.2cm}
+	\icon{MapMarker}{12}{Bath / Reading}
+	\hfill
+	\icon{Phone}{12}{\tel{+44 7564 199236}}
+	\hfill
+	\icon{At}{12}{\emailaddr{me@joshuacoles.me}}
+	\hfill
+	\icon{Github}{12}{\href{https://github.com/joshuacoles}{joshuacoles}}
+%	\icon{Linkedin}{12}{\href{https://www.linkedin.com/in/joshua-coles-a79498151/}{LinkedIn}}
+\end{center}
+
+\vspace{0.75cm}
diff --git a/ada-core-cover-letter/main.tex b/ada-core-cover-letter/main.tex
index b77155b..9d13bfd 100644
--- a/ada-core-cover-letter/main.tex
+++ b/ada-core-cover-letter/main.tex
@@ -49,53 +49,42 @@
 	\vcenteredhbox{#3}% Text
 }
 
-% Shaded header banner
-\AddToShipoutPictureBG{%
-\color{TopBackground}
-\AtPageUpperLeft{\rule[-\shadedheight]{\paperwidth}{\shadedheight}}
-}
-
+%%%
 % Header
-\begin{center}
-{\fontsize{28}{0}\selectfont\scshape \myname}
+%%%
 
-\vspace{0.2cm}
-	\icon{MapMarker}{12}{Bath / Reading}
-	\hfill
-	\icon{Phone}{12}{\tel{+44 7564 199236}}
-	\hfill
-	\icon{At}{12}{\emailaddr{me@joshuacoles.me}}
-	\hfill
-	\icon{Github}{12}{\href{https://github.com/joshuacoles}{joshuacoles}}
-%	\icon{Linkedin}{12}{\href{https://www.linkedin.com/in/joshua-coles-a79498151/}{LinkedIn}}
-\end{center}
+\input{header}
 
-\vspace{0.75cm}
 
+%%%
 % Opening block
-\today
-\\
+%%%
 
-\vspace{-0.1in}\recipient\\\company
-\ifthenelse{\boolean{include-company-address}}{\\\companyaddress}{}\\
+% Date
+\today \\
 
-\vspace{-0.1in}\greeting\ \recipient,\\
+% Address
+\vspace{-0.1in}\recipient\\\company\\
+\ifthenelse{\boolean{include-company-address}}
+{\companyaddress\\}
+{}
 
+
+% Greeting
+\vspace{-0.1in}
+\greeting\ \recipient, \\
+
+%%%
 % Body
+%%%
+
 \vspace{-0.1in}\setlength\parindent{24pt}
 \noindent\input{body}
 
+%%%
 % Closer
-\vspace{0.1in}
-\vfill
+%%%
 
-\begin{flushright}
-\closer,
-
-\ifthenelse{\boolean{include-signature}}{\vspace{-0.1in}\includegraphics[width=1.5in]{sig.png}\vspace{-0.1in}}{}
-
-\myname\\
-\mytitle
-\end{flushright}
+\input{closer}
 
 \end{document}
\ No newline at end of file