diff --git a/bin/software-install.sh b/bin/software-install.sh
index 8febc81..4a4cc4f 100755
--- a/bin/software-install.sh
+++ b/bin/software-install.sh
@@ -1,14 +1,25 @@
 #!/bin/bash
 
+#-------------------------------
+# Check OS
+#-------------------------------
 if [ $(uname -s) != "Darwin" ]; then
     echo "This should only run on Mac OS X."
     exit 1
 fi
+#-------------------------------
 
+#-------------------------------
+# Install Homebrew if missing
+#-------------------------------
 if [ ! -x /usr/local/bin/brew ]; then
     ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 fi
+#-------------------------------
 
+#-------------------------------
+# Install the basics
+#-------------------------------
 xargs brew install <<EOF
     git
     coreutils
@@ -16,7 +27,11 @@ xargs brew install <<EOF
     python3
     vim
 EOF
+#-------------------------------
 
+#-------------------------------
+# Install Casks
+#-------------------------------
 xargs brew cask install <<EOF
     alfred
     bbc-iplayer-downloads
@@ -44,3 +59,4 @@ xargs brew cask install <<EOF
     yubikey-neo-manager
     yubikey-personalization-gui
 EOF
+#-------------------------------