diff --git a/Dockerfile b/Dockerfile
index fcd564a34a..c5d97fb840 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,39 +1,36 @@
 FROM ubuntu:14.04.2
 
 ## Environment setup
-ENV HOME /root
 ENV GOPATH /root/go
 ENV PATH /root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
 
-RUN mkdir -p /root/go
 ENV DEBIAN_FRONTEND noninteractive
 
 ## Install base dependencies
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y git mercurial build-essential software-properties-common wget pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev
+RUN apt-get update && apt-get upgrade -y && \
+    apt-get install -y git mercurial build-essential software-properties-common wget \
+        pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev
 
 ## Install Qt5.4.1 (not required for CLI)
-# RUN add-apt-repository ppa:beineri/opt-qt541-trusty -y
-# RUN apt-get update -y
-# RUN apt-get install -y qt54quickcontrols qt54webengine mesa-common-dev libglu1-mesa-dev
+# RUN add-apt-repository ppa:beineri/opt-qt541-trusty -y && \
+#     apt-get install -y qt54quickcontrols qt54webengine mesa-common-dev libglu1-mesa-dev
 # ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig
 
-# Install Golang
-RUN wget https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go*.tar.gz && go version
+# Install Go
+RUN wget https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go*.tar.gz && \
+    go version
 
-# this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes
+# Workaround, to make sure that docker's cache is invalidated whenever the git repo changes
 ADD https://api.github.com/repos/ethereum/go-ethereum/git/refs/heads/develop file_does_not_exist
 
 ## Fetch and install go-ethereum
-RUN mkdir -p $GOPATH/src/github.com/ethereum/
-RUN git clone https://github.com/ethereum/go-ethereum $GOPATH/src/github.com/ethereum/go-ethereum
-WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum
-RUN git checkout develop
-RUN GOPATH=$GOPATH:$GOPATH/src/github.com/ethereum/go-ethereum/Godeps/_workspace go install -v ./cmd/geth
+RUN mkdir -p $GOPATH/src/github.com/ethereum/                                                             && \
+    git clone https://github.com/ethereum/go-ethereum $GOPATH/src/github.com/ethereum/go-ethereum         && \
+    cd $GOPATH/src/github.com/ethereum/go-ethereum                                                        && \
+    git checkout develop                                                                                  && \
+    GOPATH=$GOPATH:$GOPATH/src/github.com/ethereum/go-ethereum/Godeps/_workspace go install -v ./cmd/geth
 
 ## Run & expose JSON RPC
 ENTRYPOINT ["geth", "-rpc=true", "-rpcport=8545"]
 EXPOSE 8545
-
-