Tidying up Dockerfile and Dockerfile.base