diff --git a/bitmessage b/bitmessage
index 0fe1871..31d09b6 100755
--- a/bitmessage
+++ b/bitmessage
@@ -1,21 +1,21 @@
 #!/bin/bash
 # filename: bitmessage
-set -euxo pipefail 
+set -euxo pipefail
 
-# open Docker container: 
+# open Docker container:
 #    port 8444 available, sharing local directories for SSH and Bitmessage data
 #    detatched, interactive, pseudo-tty (-dit)
 #  record container ID in $DID (Docker ID)
 DID=$(docker run -p 8444:8444 -v ~/.config/PyBitmessage/:/root/.config/PyBitmessage -v ~/.config/PyBitmessage/keys/:/root/.ssh/ -dit j0rg3/bitmessage-gui bash)
 
 # find IP address of new container, record in $DIP (Docker IP)
-DIP=$(docker inspect $DID | grep IPAddress | cut -d '"' -f 4)
+DIP=$(docker inspect "$DID" | grep -m 2 IPAddress | cut -d '"' -f 4)
 
-# pause for one second to allow container's SSHD to come online
-sleep 1
+# pause for five seconds to allow container's SSHD to come online
+sleep 5
 
 # SSH into container and execute Bitmessage
-ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oIdentityFile=~/.config/PyBitmessage/keys/docker-bitmessage-keys -X $DIP ./PyBitmessage/src/bitmessagemain.py 
+ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oIdentityFile=~/.config/PyBitmessage/keys/docker-bitmessage-keys -X "$DIP" ./PyBitmessage/src/bitmessagemain.py
 
 # close container if Bitmessage is closed
-docker kill $DID
+docker kill "$DID"
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 7d8cb59..e8174d8 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -3,7 +3,7 @@
 set -euxo pipefail
 
 service ssh start
-cd /root/PyBitmessage 
+cd /root/PyBitmessage
 git pull
 
 exec "$@"
diff --git a/install.sh b/install.sh
index 6c54439..9d9cf66 100755
--- a/install.sh
+++ b/install.sh
@@ -18,5 +18,3 @@ ln -fs docker-bitmessage-keys.pub authorized_keys
 
 # link to Bitmessage script for system-wide access
 ln -fs ~/docker-bitmessage-gui/bitmessage /usr/local/bin/bitmessage
-
-