diff --git a/cfg/commands.tex b/cfg/commands.tex
deleted file mode 100644
index b632166..0000000
--- a/cfg/commands.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\newcommand{\boxalert}[1]{{
-    \usebeamercolor{alerted text}
-    \colorbox{bg}{\alert{#1}}
-}}
-
-\newtcblisting{cisco}[1][]{
-    size=fbox,
-    listing only,
-    listing options={
-        style=tcblatex,
-        basicstyle=\ttfamily\scriptsize,
-        tabsize=1,
-        language=sh,
-        breaklines=false,
-        columns=fullflexible
-    },
-    #1
-}
-
-\newcommand{\pic}[2]{
-    \begin{center}
-        \transparent{0.4}
-        \includegraphics[height=#1]{#2}
-    \end{center}
-}
diff --git a/main.tex b/main.tex
index e6ab8e9..bd901d0 100644
--- a/main.tex
+++ b/main.tex
@@ -15,11 +15,19 @@
 % to the file main.tex
 \graphicspath{{img/}}
 
+% Custom commands
 \newcommand{\insertoutput}[1]{
     \begin{center}
         \includegraphics[width=12cm]{#1}
     \end{center}
 }
+\newcommand{\pic}[2]{
+    \begin{center}
+        \transparent{0.4}
+        \includegraphics[height=#1]{#2}
+    \end{center}
+}
+
 
 % In which order to look after images in
 % declared graphicspath{}'s
@@ -61,6 +69,8 @@
 
 \subsection{Router}
 
+% <!-- ROUTER: base.cfg -->
+
 \subsubsection{File: base.cfg}
 
 \begin{minted}[frame=lines,framesep=2mm,baselinestretch=1.2,bgcolor=lightgray,fontsize=\footnotesize,linenos,breaklines=true]{tcl}
@@ -82,6 +92,8 @@ end
 tclquit
 \end{minted}
 
+% <!-- ROUTER: reset.tcl -->
+
 \subsubsection{File: reset.tcl}
 
 \begin{minted}[frame=lines,framesep=2mm,baselinestretch=1.2,bgcolor=lightgray,fontsize=\footnotesize,linenos,breaklines=true]{tcl}
@@ -106,6 +118,8 @@ tclquit
 
 \subsection{Switch}
 
+% <!-- SWITCH: base.cfg -->
+
 \subsubsection{File: base.cfg}
 
 \begin{minted}[frame=lines,framesep=2mm,baselinestretch=1.2,bgcolor=lightgray,fontsize=\footnotesize,linenos,breaklines=true]{tcl}
@@ -127,6 +141,8 @@ end
 tclquit
 \end{minted}
 
+% <!-- SWITCH: reset.tcl -->
+
 \subsubsection{File: reset.tcl}
 
 \begin{minted}[frame=lines,framesep=2mm,baselinestretch=1.2,bgcolor=lightgray,fontsize=\footnotesize,linenos,breaklines=true]{tcl}