Clean up Dockerfile a little