diff --git a/common-files/etc/init.d/S99metadata b/common-files/etc/init.d/S99metadata
index 37bf9c9..05e69b7 100755
--- a/common-files/etc/init.d/S99metadata
+++ b/common-files/etc/init.d/S99metadata
@@ -6,11 +6,10 @@ check_net() {
         wget -q -O - -T 10 $url/public-keys 2> /dev/null || exit 1
         echo
     ) | (
-        while read line
-        do
-        key=$(echo $line | sed 's/\([0-9]\+\)=.*/\1/')
-        key_url=$url/public-keys/$key/openssh-key
-        wget -q -O - -T 10 $key_url 2> /dev/null || exit 1
+        while read line ; do
+            key=$(echo $line | sed 's/\([0-9]\+\)=.*/\1/')
+            key_url=$url/public-keys/$key/openssh-key
+            wget -q -O - -T 10 $key_url 2> /dev/null || exit 1
         done
     ) >> authorized_keys
 }
@@ -24,8 +23,7 @@ json_metadata() {
 check_cd() {
     [ -b /dev/sr0 ] || return
     mkdir /tmp/cd
-    if mount /dev/sr0 /tmp/cd
-    then
+    if mount /dev/sr0 /tmp/cd ; then
         json_metadata /tmp/cd >> authorized_keys
         umount /tmp/cd
     fi
diff --git a/init-buildroot.sh b/init-buildroot.sh
index 1d42678..f5ea091 100755
--- a/init-buildroot.sh
+++ b/init-buildroot.sh
@@ -7,8 +7,7 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-if which lsb_release 2> /dev/null && [ $(lsb_release -i -s) = "Ubuntu" ]
-then
+if which lsb_release 2> /dev/null && [ $(lsb_release -i -s) = "Ubuntu" ] ; then
     sudo apt-get -y install curl unzip bc python quilt parted qemu-utils \
         build-essential gcc-multilib
 fi
@@ -17,22 +16,19 @@ VERSION=2016.02
 FILENAME=buildroot-${VERSION}.tar.bz2
 
 # Download buildroot if we don't have it already
-if [ ! -f download/$FILENAME ]
-then
+if [ ! -f download/$FILENAME ] ; then
     wget -P download http://buildroot.org/downloads/$FILENAME
 fi
 
 # Untar buildroot if it's not already there
-if [ ! -d buildroot ]
-then
+if [ ! -d buildroot ] ; then
     mkdir buildroot
     tar -C buildroot -xf download/$FILENAME --strip 1
 fi
 
 # Apply patches to buildroot if we haven't done so before
 PATCH_FLAG_FILE=buildroot/.manila-patches-applied
-if [ ! -f $PATCH_FLAG_FILE ]
-then
+if [ ! -f $PATCH_FLAG_FILE ] ; then
     ( cd buildroot ; QUILT_PATCHES=../patches quilt push -a )
     touch $PATCH_FLAG_FILE
 fi
diff --git a/make-bootable-disk.sh b/make-bootable-disk.sh
index 973767d..4d6878c 100755
--- a/make-bootable-disk.sh
+++ b/make-bootable-disk.sh
@@ -10,8 +10,7 @@
 DISK_NAME=$1
 BR_OUTPUT=output-$1
 
-if [ -z "$DISK_NAME" ]
-then
+if [ -z "$DISK_NAME" ] ; then
     echo Specify disk name
     exit 2
 fi
@@ -52,8 +51,7 @@ sudo tar -C $MOUNT -xf $BR_OUTPUT/images/rootfs.tar
 echo Installing syslinux
 sudo $BR_OUTPUT/host/sbin/extlinux -z --install $MOUNT/boot
 
-if [ $DISK_NAME = server ]
-then
+if [ $DISK_NAME = server ] ; then
     echo Creating share dir
     SHARE_DIR=$MOUNT/share
     sudo mkdir -p $SHARE_DIR
diff --git a/run-buildroot.sh b/run-buildroot.sh
index ead9e07..2057007 100755
--- a/run-buildroot.sh
+++ b/run-buildroot.sh
@@ -12,22 +12,19 @@
 # Grab JSON.sh for json parsing
 JSON_VERS=e05e69a0debdba68125a33ac786726cb860b2e7b
 JSON_SH=https://raw.githubusercontent.com/dominictarr/JSON.sh/$JSON_VERS/JSON.sh
-if [ ! -x download/JSON.sh ]
-then
+if [ ! -x download/JSON.sh ] ; then
     curl -s $JSON_SH > download/JSON.sh
     chmod +x download/JSON.sh
 fi
 
 # Create the filesystem overlays
-if [ ! -d overlay-client ]
-then
+if [ ! -d overlay-client ] ; then
     mkdir overlay-client
     cp -a common-files/* overlay-client
     mkdir -p overlay-client/usr/bin
     cp download/JSON.sh overlay-server/usr/bin
 fi
-if [ ! -d overlay-server ]
-then
+if [ ! -d overlay-server ] ; then
     mkdir overlay-server
     cp -a common-files/* overlay-server
     cp -a server-files/* overlay-server
@@ -44,8 +41,7 @@ cd buildroot
 BUILD_IMAGES="client server"
 
 # Setup the build directories with their configs
-for IMAGE in $BUILD_IMAGES
-do
+for IMAGE in $BUILD_IMAGES ; do
     make O=../output-${IMAGE} manila_${IMAGE}_defconfig
 done
 
@@ -53,8 +49,7 @@ done
 rm configs/manila_*_defconfig
 
 # Do the builds
-for IMAGE in $BUILD_IMAGES
-do
+for IMAGE in $BUILD_IMAGES ; do
     make O=../output-${IMAGE} all
     ( cd .. ; ./make-bootable-disk.sh $IMAGE )
 done
diff --git a/tox.ini b/tox.ini
index f5cc9ba..d09399f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,4 +13,4 @@ commands = bash -c "find {toxinidir} \
                     -not \( -type d -name buildroot -prune \) \
                     -not \( -type d -name download -prune \) \
                     -type f -name \*.sh \
-                    -print0 | xargs -0 bashate -v -iE010,E011"
+                    -print0 | xargs -0 bashate -v"