diff --git a/Dockerfile b/Dockerfile
index 00a1ad8..cd4d7af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,26 @@
 FROM ubuntu:latest
-MAINTAINER John Fink <john.fink@gmail.com>
-RUN apt-get update # Fri Oct 24 13:09:23 EDT 2014
-RUN apt-get -y upgrade
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-client mysql-server apache2 libapache2-mod-php5 pwgen python-setuptools vim-tiny php5-mysql  php5-ldap
-RUN easy_install supervisor
+LABEL maintainer="John Fink <john.fink@gmail.com>"
+
+# Fri Oct 24 13:09:23 EDT 2014
+RUN apt-get update && \
+	apt-get -y upgrade && \
+	DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-client mysql-server apache2 && \
+	libapache2-mod-php5 pwgen python-setuptools vim-tiny php5-mysql php5-ldap && \
+	easy_install supervisor
+
 ADD ./scripts/start.sh /start.sh
 ADD ./scripts/foreground.sh /etc/apache2/foreground.sh
 ADD ./configs/supervisord.conf /etc/supervisord.conf
 ADD ./configs/000-default.conf /etc/apache2/sites-available/000-default.conf
-RUN rm -rf /var/www/
 ADD https://wordpress.org/latest.tar.gz /wordpress.tar.gz
-RUN tar xvzf /wordpress.tar.gz 
-RUN mv /wordpress /var/www/
-RUN chown -R www-data:www-data /var/www/
-RUN chmod 755 /start.sh
-RUN chmod 755 /etc/apache2/foreground.sh
-RUN mkdir /var/log/supervisor/
+
+RUN rm -rf /var/www/ && \
+	tar xvzf /wordpress.tar.gz && \
+	mv /wordpress /var/www/ && \
+	chown -R www-data:www-data /var/www/ && \
+	chmod 755 /start.sh && \
+	chmod 755 /etc/apache2/foreground.sh && \
+	mkdir /var/log/supervisor/
+
 EXPOSE 80
 CMD ["/bin/bash", "/start.sh"]