diff --git a/dropbear_hook b/dropbear_hook
index 27d8e95..68d25e1 100644
--- a/dropbear_hook
+++ b/dropbear_hook
@@ -1,16 +1,14 @@
 #!/bin/sh
 
-run_hook ()
-{
-  [ -d /dev/pts ] || mkdir -p /dev/pts
-  mount -t devpts devpts /dev/pts
+run_hook() {
+    [ -d /dev/pts ] || mkdir -p /dev/pts
+    mount -t devpts devpts /dev/pts
 
-  echo "Starting dropbear"
-  /usr/sbin/dropbear -E -s -j -k
+    echo "Starting dropbear"
+    /usr/sbin/dropbear -E -s -j -k
 }
 
-run_cleanuphook ()
-{
+run_cleanuphook() {
     umount /dev/pts
     rm -R /dev/pts
     if [ -f /var/run/dropbear.pid ]; then
diff --git a/dropbear_install b/dropbear_install
index 3120cf7..dfdefc4 100644
--- a/dropbear_install
+++ b/dropbear_install
@@ -1,97 +1,95 @@
 #!/bin/sh
 
 get_fingerprint() {
-  keyfile="$1"
-  dropbearkey -y -f "${keyfile}" | sed -n '/^Fingerprint:/ {s/Fingerprint: *//; p}'
+    keyfile="$1"
+    dropbearkey -y -f "${keyfile}" | sed -n '/^Fingerprint:/ {s/Fingerprint: *//; p}'
 }
 
 display_fingerprints() {
-  keyfile
+    keyfile
 
-  for keyfile in "/etc/dropbear/dropbear_rsa_host_key" "/etc/dropbear/dropbear_ecdsa_host_key" ; do
-      if [ -s "${keyfile}" ] ; then
-	  echo "$(basename "${keyfile}") : $(get_fingerprint "${keyfile}")"
-      fi
-  done
+    for keyfile in "/etc/dropbear/dropbear_rsa_host_key" "/etc/dropbear/dropbear_ecdsa_host_key"; do
+        if [ -s "${keyfile}" ]; then
+            echo "$(basename "${keyfile}") : $(get_fingerprint "${keyfile}")"
+        fi
+    done
 }
 
 copy_openssh_keys() {
-  osshrsa="/etc/ssh/ssh_host_rsa_key"
-  osshecdsa="/etc/ssh/ssh_host_ecdsa_key"
+    osshrsa="/etc/ssh/ssh_host_rsa_key"
+    osshecdsa="/etc/ssh/ssh_host_ecdsa_key"
 
-  dbpre="/etc/dropbear/dropbear_"
+    dbpre="/etc/dropbear/dropbear_"
 
-  return_code=1
+    return_code=1
 
-  if [ -s "$osshrsa" ]; then
-      dropbearconvert openssh dropbear $osshrsa ${dbpre}rsa_host_key
-      return_code=0
-  fi
+    if [ -s "$osshrsa" ]; then
+        dropbearconvert openssh dropbear $osshrsa ${dbpre}rsa_host_key
+        return_code=0
+    fi
 
-  if [ -s "$osshecdsa" ]; then
-      dropbearconvert openssh dropbear $osshecdsa ${dbpre}ecdsa_host_key
-      return_code=0
-  fi
+    if [ -s "$osshecdsa" ]; then
+        dropbearconvert openssh dropbear $osshecdsa ${dbpre}ecdsa_host_key
+        return_code=0
+    fi
 
-  return $return_code
+    return $return_code
 }
 
 generate_keys() {
-  keyfile keytype
-  for keytype in rsa ecdsa ; do
-      keyfile="/etc/dropbear/dropbear_${keytype}_host_key"
-      if [ ! -s "$keyfile" ]; then
-	  echo "Generating ${keytype} host key for dropbear ..."
-	  dropbearkey -t "${keytype}" -f "${keyfile}"
-      fi
-  done
+    keyfile keytype
+    for keytype in rsa ecdsa; do
+        keyfile="/etc/dropbear/dropbear_${keytype}_host_key"
+        if [ ! -s "$keyfile" ]; then
+            echo "Generating ${keytype} host key for dropbear ..."
+            dropbearkey -t "${keytype}" -f "${keyfile}"
+        fi
+    done
 }
 
-build ()
-{
-  #
-  # Begin real processing
-  #
+build() {
+    #
+    # Begin real processing
+    #
 
-  # Are we even needed?
-  if [ ! -r "/etc/dropbear/root_key" ] || [ ! -s "/etc/dropbear/root_key" ]; then
-    echo "There is no root key in /etc/dropbear/root_key existent; exit"
-    return 0
-  fi
+    # Are we even needed?
+    if [ ! -r "/etc/dropbear/root_key" ] || [ ! -s "/etc/dropbear/root_key" ]; then
+        echo "There is no root key in /etc/dropbear/root_key existent; exit"
+        return 0
+    fi
 
-  # if TMPDIR is set leave it alone otherwise set
-  [ -z "$TMPDIR" ] && TMPDIR='/tmp/dropbear_initrd_encrypt'
+    # if TMPDIR is set leave it alone otherwise set
+    [ -z "$TMPDIR" ] && TMPDIR='/tmp/dropbear_initrd_encrypt'
 
-  # check if TMPDIR exsists if not make it
-  [ -d "$TMPDIR" ] || mkdir -p "$TMPDIR"
+    # check if TMPDIR exsists if not make it
+    [ -d "$TMPDIR" ] || mkdir -p "$TMPDIR"
 
-  umask 0022
+    umask 0022
 
-  [ -d /etc/dropbear ] && mkdir -p /etc/dropbear
+    [ -d /etc/dropbear ] && mkdir -p /etc/dropbear
 
-  copy_openssh_keys || generate_keys
-  display_fingerprints
+    copy_openssh_keys || generate_keys
+    display_fingerprints
 
-  add_checked_modules "/drivers/net/"
-  add_binary "rm"
-  add_binary "killall"
-  add_binary "dropbear"
+    add_checked_modules "/drivers/net/"
+    add_binary "rm"
+    add_binary "killall"
+    add_binary "dropbear"
 
-  add_dir "/root/.ssh"
-  cat /etc/dropbear/root_key > "${BUILDROOT}"/root/.ssh/authorized_keys
+    add_dir "/root/.ssh"
+    cat /etc/dropbear/root_key >"${BUILDROOT}"/root/.ssh/authorized_keys
 
-  add_full_dir "/etc/dropbear"
-  add_file "/lib/libnss_files.so.2"
-  add_dir "/var/run"
-  add_dir "/var/log"
-  touch "${BUILDROOT}"/var/log/lastlog
+    add_full_dir "/etc/dropbear"
+    add_file "/lib/libnss_files.so.2"
+    add_dir "/var/run"
+    add_dir "/var/log"
+    touch "${BUILDROOT}"/var/log/lastlog
 
-  add_runscript
+    add_runscript
 }
 
-help ()
-{
-    cat<<HELPEOF
+help() {
+    cat <<HELPEOF
 This hook is meant to be used in conjunction with mkinitcpio-netconf and/or
 mkinitcpio-ppp. It DOES NOT provide any default shell. It will only install
 and start dropbear on early userspace. In the package mkinitcpio-utils you