diff --git a/Dockerfile b/Dockerfile
index d9af63e9..3249ceb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,17 @@ RUN mkdir /opt/AIL && apt-get update -y \
 # Adding sudo command
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 RUN echo "root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-#RUN echo "docker ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
-#USER docker
+# Installing AIL dependencies
 ADD . /opt/AIL
 WORKDIR /opt/AIL
 RUN ./installing_deps.sh 
+WORKDIR /opt/AIL
+
+# Installing Web dependencies,
+# remove all the parts below if you dont need the Web UI
 WORKDIR /opt/AIL/var/www
 RUN ./update_thirdparty.sh
-
 WORKDIR /opt/AIL
 
 CMD bash docker_start.sh
diff --git a/README.md b/README.md
index 63a9ff9e..d2c1549b 100644
--- a/README.md
+++ b/README.md
@@ -60,18 +60,18 @@ apt-get install -y curl
 curl https://get.docker.com | /bin/bash
 ```
 
-2. Type these commands to build the Docker image
+2. Type these commands to build the Docker image:
 ```
 git clone https://github.com/CIRCL/ail-framework
 cd AIL-framework
 docker build -t ail-framework
 ```
-3. To start AIL on port 7000, type the following command below.
+3. To start AIL on port 7000, type the following command below:
 ```
 docker run -p 7000:7000 ail-framework
 ```
 
-To debug the running container, type the following command and note the container name or identifier
+4. To debug the running container, type the following command and note the container name or identifier:
 ```
 docker ps
 ```
@@ -82,6 +82,7 @@ docker exec -it CONTAINER_NAME_OR_IDENTIFIER bash
 cd /opt/ail
 ```
 
+
 Starting AIL web interface
 --------------------------