Made Dockerfiles more concise.