diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 3c681ccd16b44e5ef028439247ad555e09e15ac0..cad11272cb9f7b7f18ea1d669456ecb59342a3a8 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,6 +1,6 @@
 # Author: David Blyth
 # Description: Docker build intended to replicate the FPaDSim environment
-#     created by Sergei Chekanov
+#	  created by Sergei Chekanov
 
 FROM dbcooper/arch:2017-02-18
 
@@ -10,7 +10,7 @@ RUN pacman -S --noconfirm \
 	sudo
 
 RUN useradd -m -G wheel fpadsimuser && \
-    sed -i.bak 's/# \(%wheel ALL=(ALL) NOPASSWD: ALL\)/\1/' /etc/sudoers
+	sed -i.bak 's/# \(%wheel ALL=(ALL) NOPASSWD: ALL\)/\1/' /etc/sudoers
 
 USER fpadsimuser
 WORKDIR /home/fpadsimuser
@@ -19,93 +19,93 @@ CMD /bin/bash -l
 
 # ROOT
 RUN sudo pacman -S --noconfirm \
-        awk \
-        binutils \
-        cmake \
-        fakeroot \
-        fftw \
-        gcc \
-        git \
-        glew \
-        glu \
-        grep \
-        gsl \
-        gzip \
-        make \
-        python2 \
-        libx11 \
-        libxft \
-        libxpm
+		awk \
+		binutils \
+		cmake \
+		fakeroot \
+		fftw \
+		gcc \
+		git \
+		glew \
+		glu \
+		grep \
+		gsl \
+		gzip \
+		make \
+		python2 \
+		libx11 \
+		libxft \
+		libxpm
 
 ENV ROOT_VERSION 6-10-00
 
 RUN git clone https://github.com/root-project/root.git && \
-        cd root && \
-        git checkout tags/v$ROOT_VERSION && \
-        cd .. && \
-        mkdir build && \
-        cd build && \
-        cmake ../root \
-            -Dbuiltin_glew=OFF \
-            -Dcxx14=ON \
-            -Dgdml=ON \
-            -Dgsl_shared=ON \
-            -Dmathmore=ON \
-            -Dminuit2=ON \
-            -Dopengl=ON && \
-        make -j30 && \
-        sudo make install && \ 
-        cd .. && \
-        rm -rf build root
+	cd root && \
+	git checkout tags/v$ROOT_VERSION && \
+	cd .. && \
+	mkdir build && \
+	cd build && \
+	cmake ../root \
+		-Dbuiltin_glew=OFF \
+		-Dcxx14=ON \
+		-Dgdml=ON \
+		-Dgsl_shared=ON \
+		-Dmathmore=ON \
+		-Dminuit2=ON \
+		-Dopengl=ON && \
+	make -j30 && \
+	sudo make install && \ 
+	cd .. && \
+	rm -rf build root
 
 RUN sudo bash -c 'echo ". /usr/local/bin/thisroot.sh" > /etc/profile.d/ROOT.sh' && \
-        sudo chmod +x /etc/profile.d/ROOT.sh
+	sudo chmod +x /etc/profile.d/ROOT.sh
 
 # CLHEP
 RUN sudo pacman -S --noconfirm \
-        wget \
-        xerces-c
+		wget \
+		xerces-c
 
 ENV CLHEP_VERSION 2.3.4.4
 
 RUN wget http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-$CLHEP_VERSION.tgz -q -O clhep.tgz && \
-        tar -xzf clhep.tgz && \
-        mv $CLHEP_VERSION/CLHEP ./ && \
-        rm -rf $CLHEP_VERSION && \
-        mkdir build && \
-        cd build && \
-        CXXFLAGS=-std=c++14 cmake ../CLHEP && \
-        make -j30 && \
-        sudo make install && \
-        cd .. && \
-        rm -rf build CLHEP clhep.tgz
+	tar -xzf clhep.tgz && \
+	mv $CLHEP_VERSION/CLHEP ./ && \
+	rm -rf $CLHEP_VERSION && \
+	mkdir build && \
+	cd build && \
+	CXXFLAGS=-std=c++14 cmake ../CLHEP && \
+	make -j30 && \
+	sudo make install && \
+	cd .. && \
+	rm -rf build CLHEP clhep.tgz
 
 # GEANT4
 ENV GEANT4_VERSION 10.3.1
 
 RUN git clone https://github.com/Geant4/geant4.git && \
-        cd geant4 && \
-        git checkout tags/v$GEANT4_VERSION && \
-        cd .. && \
-        mkdir build && \
-        cd build && \
-        cmake ../geant4 \
-            -DGEANT4_BUILD_CXXSTD=14 \
-            -DGEANT4_INSTALL_DATA=ON \
-            -DGEANT4_USE_GDML=ON \
-            -DGEANT4_USE_SYSTEM_CLHEP=ON && \
-        make -j30 && \
-        sudo make install && \
-        cd .. && \
-        rm -rf build geant4
+	cd geant4 && \
+	git checkout tags/v$GEANT4_VERSION && \
+	cd .. && \
+	mkdir build && \
+	cd build && \
+	cmake ../geant4 \
+		-DGEANT4_BUILD_CXXSTD=14 \
+		-DGEANT4_INSTALL_DATA=ON \
+		-DGEANT4_USE_GDML=ON \
+		-DGEANT4_USE_SYSTEM_CLHEP=ON && \
+	make -j30 && \
+	sudo make install && \
+	cd .. && \
+	rm -rf build geant4
 
 RUN sudo bash -c 'echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/usr/local/lib64" >> /etc/profile.d/geant4.sh' && \
-        sudo bash -c 'echo ". /usr/local/bin/geant4.sh" > /etc/profile.d/geant4.sh' && \
-        sudo chmod +x /etc/profile.d/geant4.sh
+	sudo bash -c 'echo ". /usr/local/bin/geant4.sh" > /etc/profile.d/geant4.sh' && \
+	sudo chmod +x /etc/profile.d/geant4.sh
 
 # Oracle JDK
 RUN sudo pacman -S --noconfirm \
-	file
+		file
 
 RUN git clone https://aur.archlinux.org/jdk.git && \
 	cd jdk && \
@@ -115,24 +115,24 @@ RUN git clone https://aur.archlinux.org/jdk.git && \
 	rm -rf jdk
 
 # LCIO
-ENV     LCIO_VERSION 02-06
-ENV     LCIO_DIR /opt/LCIO
+ENV LCIO_VERSION 02-06
+ENV	LCIO_DIR /opt/LCIO
 
 RUN git clone https://github.com/iLCSoft/LCIO.git /opt/LCIO && \
-        cd $LCIO_DIR && \
-        git checkout tags/v$LCIO_VERSION && \
-        cd ~/ && \
-        mkdir build && \
-        cd build && \
-        CXXFLAGS=-std=c++14 cmake $LCIO_DIR && \
-        make -j30 && \
-        make install && \
-        cd ../ && \
-        rm -rf build
+	cd $LCIO_DIR && \
+	git checkout tags/v$LCIO_VERSION && \
+	cd ~/ && \
+	mkdir build && \
+	cd build && \
+	CXXFLAGS=-std=c++14 cmake $LCIO_DIR && \
+	make -j30 && \
+	make install && \
+	cd ../ && \
+	rm -rf build
 
 RUN sudo bash -c "echo 'export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$LCIO_DIR/lib' >> /etc/profile.d/LCIO.sh" && \
-        sudo bash -c "echo 'export PATH=\$PATH:$LCIO_DIR/bin' >> /etc/profile.d/LCIO.sh" && \
-        sudo chmod +x /etc/profile.d/LCIO.sh
+	sudo bash -c "echo 'export PATH=\$PATH:$LCIO_DIR/bin' >> /etc/profile.d/LCIO.sh" && \
+	sudo chmod +x /etc/profile.d/LCIO.sh
 
 # HepPDT
 ENV HEPPDTVERSION 3.04.01
@@ -225,7 +225,7 @@ RUN sudo chown -R root:root v05-00-03 && \
 	sudo cmake /opt/slic -DILCUTIL_DIR=$ILCUTIL_DIR -DLCIO_INCLUDE_DIRS=$LCIO_DIR/include -DGDML_DIR=/opt/gdml \
 		-DLCDD_DIR=/opt/lcdd  -DINSTALL_DOC=OFF -DCMAKE_SKIP_RPATH=1 && \
 	sudo make -j30 install && \
-	cd ../  && \
+	cd ../	&& \
 	sudo rm -rf build && \
 	sudo bash -c "echo 'export PATH=\$PATH:/opt/slic/bin' >> /etc/profile.d/slic.sh" && \
 	sudo chmod +x /etc/profile.d/slic.sh
@@ -279,8 +279,8 @@ RUN echo 'export FPADSIM=/opt' | sudo bash -c "cat >> /etc/profile.d/fpadsim.sh"
 
 # LCSIM
 RUN sudo pacman -S --noconfirm \
-        maven \
-	which
+		maven \
+		which
 
 ENV LCSIM_VERSION 3.4
 ENV LCSIM_COMMIT 10676ef098385d0a4830561c8fb4aaceec61408e
@@ -288,17 +288,17 @@ ENV LCSIM_COMMIT 10676ef098385d0a4830561c8fb4aaceec61408e
 RUN git clone https://github.com/decibelCooper/lcsim-withdeps.git /opt/lcsim && \
 	cd /opt/lcsim && \
 	git checkout $LCSIM_COMMIT && \
-        mvn -DskipTests && \
+		mvn -DskipTests && \
 	rm -rf ~/.m2
 
 RUN echo "export CLICSOFT=/opt/lcsim; export GEOMCONVERTERDIR=\$CLICSOFT/detector-framework; export GCONVERTER=\$GEOMCONVERTERDIR/target/lcsim-detector-framework-$LCSIM_VERSION-bin.jar" | sudo bash -c "cat >> /etc/profile.d/lcsim.sh" && \
-        sudo chmod +x /etc/profile.d/lcsim.sh
+	sudo chmod +x /etc/profile.d/lcsim.sh
 
 # ProMC
 RUN sudo pacman -S --noconfirm \
-	diffutils \
-	pkg-config \
-	rsync
+		diffutils \
+		pkg-config \
+		rsync
 
 ENV PROMC_VERSION 1.6
 
@@ -328,5 +328,5 @@ RUN wget https://atlaswww.hep.anl.gov/asc/jas4pp/download/jas4pp-$JAS4PP_VERSION
 
 # Required tools
 RUN sudo pacman -S --noconfirm \
-	libxtst \
-	zip
+		libxtst \
+		zip