Simpified the Dockerfile