diff --git a/scientificcomputing-script.tex b/scientificcomputing-script.tex
index 7b1677d..ce46b60 100644
--- a/scientificcomputing-script.tex
+++ b/scientificcomputing-script.tex
@@ -2,6 +2,13 @@
 
 \input{header}
 
+\newcommand{\includechapter}[1]{%
+  \graphicspath{{#1/lecture/}{#1/lecture/figures/}{#1/images/}}%
+  \setcodepath{#1/code}%
+  \renewcommand{\texinputpath}{#1/lecture/}%
+  \include{#1/lecture/#1}%
+}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document} 
@@ -35,59 +42,37 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \part{Programming basics}
 
-\graphicspath{{programming/lecture/}}
-\setcodepath{programming/code}
-\include{programming/lecture/programming}
+\includechapter{programming}
 
-\graphicspath{{debugging/lecture/}{debugging/lecture/figures/}}
-\setcodepath{debugging/code}
-\include{debugging/lecture/debugging}
+\includechapter{debugging}
 
-\graphicspath{{plotting/lecture/}{plotting/lecture/figures/}}
-\setcodepath{plotting/code}
-\include{plotting/lecture/plotting}
+\includechapter{plotting}
 
-\graphicspath{{programmingstyle/lecture/}{programmingstyle/lecture/figures/}}
-\setcodepath{programmingstyle/code}
-\include{programmingstyle/lecture/programmingstyle}
+\includechapter{programmingstyle}
 
-\graphicspath{{designpattern/lecture/}}
-\setcodepath{designpattern/code}
-\include{designpattern/lecture/designpattern}
+\includechapter{designpattern}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \part{Data analysis}
 
-\graphicspath{{statistics/lecture/}}
-\setcodepath{statistics/code}
-\include{statistics/lecture/statistics}
+% add chapter on simulations (euler forward, odeint)
+
+\includechapter{statistics}
 
-\graphicspath{{bootstrap/lecture/}{bootstrap/lecture/figures/}}
-\setcodepath{bootstrap/code}
-\include{bootstrap/lecture/bootstrap}
+\includechapter{bootstrap}
 
-\graphicspath{{regression/lecture/}{regression/lecture/figures/}}
-\setcodepath{regression/code}
-\include{regression/lecture/regression}
+\includechapter{regression}
 
 % add chapter on generalized linear models (versus ANOVA)
 
 % add chapter on nonlinear fitting (methods, initial values, local minima)
 
-\graphicspath{{likelihood/lecture/}}
-\setcodepath{likelihood/code}
-\include{likelihood/lecture/likelihood}
+\includechapter{likelihood}
 
-\graphicspath{{pointprocesses/lecture/}}
-\setcodepath{pointprocesses/code}
-\renewcommand{\texinputpath}{pointprocesses/lecture/}
-\include{pointprocesses/lecture/pointprocesses}
+\includechapter{pointprocesses}
 
-%\graphicspath{{spectral/lecture/}{spectral/lecture/figures/}}
-%\setcodepath{spectral/code/}
-%\renewcommand{\texinputpath}{spectral/lecture/}
-%\include{spectral/lecture/spectral}
+%\includechapter{spectral}
 
 % add chapter on ROC curves
 
@@ -101,8 +86,6 @@
 
 % add chapter on simple machine learning
 
-% add chapter on simulations (euler forward, odeint)
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %\part{Tools}