diff --git a/playbook-template/bootstrap.sh b/playbook-template/bootstrap.sh
index c9d6be5560cf6965fb2f0774413f541392d6f9c8..96cfec9d8b084dba387cc678baa4e4abcae88325 100755
--- a/playbook-template/bootstrap.sh
+++ b/playbook-template/bootstrap.sh
@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 
+########################### Config ####################################
+
 reporaw="https://git.sch.bme.hu/kszk/sysadmin/ansible/ansci/-/raw/master/playbook-template"
 
+########################### Methods ####################################
+
 download() {
   local url="$1"
   local dest="$2"
-  if command -v wget &>/dev/null
-  then
+  if command -v wget &>/dev/null; then
     wget "$url" -O "$dest"
   else
     curl "$url" -O "$dest"
@@ -17,10 +20,12 @@ downloadFile() {
   download "$reporaw/$1" "$1"
 }
 
+########################### Virtualenv setup ####################################
+
 downloadFile "requirements.python.txt"
 
-if ! command -v virtualenv &>/dev/null
-then
+# check existance of virtualenv command
+if ! command -v virtualenv &>/dev/null; then
   echo "This command needs virtualenv to run."
   echo "Install it like this:"
   printf "\tpip3 install --user virtualenv\n"
@@ -28,19 +33,16 @@ then
   exit 1
 fi
 
-if [[ ! -d .venv ]]
-then
-  virtualenv .venv
-fi
+# create virtualenv if not present
+[[ ! -d .venv ]] && virtualenv .venv
 
 source .venv/bin/activate
 pip install -r requirements.python.txt
+
+########################### Ansible setup ####################################
+
 ansible-galaxy install -r requirements.galaxy.yml
 ansible-playbook -i inventory.yaml playbook.yml
 
 # to stay in our comfy virtualenv
-if [[ -z "$SHELL" ]]
-then
-  SHELL="bash"
-fi
-exec "$SHELL"
+exec "${SHELL:bash}"