Simplified Dockerfile a bit