diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 70ed074ca4ba89b00311b124e2740fa701b6f2a6..b3f5d63216b22f59795a2b5f658798fb790cb15e 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -39,30 +39,23 @@ IMPORT_OSMDATA_CACHED=true
 IMPORT_SCHEDULES=true
 INSTALL_GEOSERVER=false
 INSTALL_HTTPD=true
+INSTALL_ISOCHRONE_LOCAL=false # installs isochrone from vagrant start directory (eclipse project)
+INSTALL_ISOCHRONE_RELEASE=true # installs latest isochrone release from nexus repository
+INSTALL_ISOCHRONE_SNAPSHOT=true # installs latest isochrone snapshot from nexus repository
 INSTALL_NEO4J=false
 INSTALL_NEO4J_SPATIAL=false
 INSTALL_PGROUTING=true
 INSTALL_POSTGIS=true
 INSTALL_POSTGRES=true
 INSTALL_POSTGRES_ADMIN=true
-
-# IS_LOCAL_TEST_DEPLOY will prevent install of projects (can be set using command-line argument)
-# PsiProbe will always be installed if INSTALL_PROJECT_PSIPROBE is true (even when this is set to true)
-IS_LOCAL_TEST_DEPLOY=false
-# will install caniget2 sample project
-INSTALL_PROJECT_CANIGET2=false
-# will install isochrone from vagrant start directory (eclipse project)
-INSTALL_ISOCHRONE_LOCAL=false
-# will install latest isochrone release from nexus repository
-INSTALL_ISOCHRONE_RELEASE=true
-# will install latest isochrone snapshot from nexus repository
-INSTALL_ISOCHRONE_SNAPSHOT=true
+INSTALL_PROJECT_CANIGET2=false # installs caniget2 sample project
 INSTALL_PROJECT_PSIPROBE=true
 
 ############################
 # Ext. argument handling   #
 ############################
 
+IS_LOCAL_TEST_DEPLOY=false # will prevent install of projects if set to true (except for PsiProbe)
 PG_DB_NAME="isochrone"
 PG_DB_USER="@db_username@"
 PG_DB_PASSWORD="@db_password@"
@@ -84,12 +77,12 @@ fi
 # General configuration    #
 ############################
 
-CACHE_DIR_LOCAL=/tmp/vagrant-cache
-CACHE_DIR_REMOTE=http://www.krismer.de/files/PhD
-DEPLOY_DIR=/opt
-DOWNLOAD_DIR=$CACHE_DIR_LOCAL/wget
-SHARED_CONF_DIR=/setup/conf
-SHARED_IMG_DIR=/setup/img
+CACHE_DIR_LOCAL="/tmp/vagrant-cache"
+CACHE_DIR_REMOTE="http://www.krismer.de/files/PhD"
+DEPLOY_DIR="/opt"
+DOWNLOAD_DIR="$CACHE_DIR_LOCAL/wget"
+SHARED_CONF_DIR="/setup/conf"
+SHARED_IMG_DIR="/setup/img"
 WORKING_DIR=`pwd`
 
 ############################