diff --git a/main.cpp b/main.cpp
index eea7fb5..e1bfe89 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,3 +1,4 @@
+#include <sstream>
 #include <vector>
 #include <iostream>
 #include <string>
@@ -53,28 +54,46 @@ input_data(istream& in, bool prompt) {
     return in1;
 }
 
-int main(int argc, char* argv[])
+static size_t
+write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
+    size_t data_size = item_size * item_count;
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+    buffer->write(reinterpret_cast<const char*>(items), data_size);
+    return data_size;
+}
+Input
+download(const string& address) {
+    stringstream buffer;
+    CURL* curl = curl_easy_init();
+    if (curl) {
+        CURLcode res;
+        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
+        res = curl_easy_perform(curl);
+        if (res != CURLE_OK) {
+            fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
+            exit(1);
+        }
+        curl_easy_cleanup(curl);
+    }
+    return input_data(buffer, false);
+}
+
+int
+main(int argc, char* argv[])
 {
+#include <curl/curl.h>
     curl_global_init(CURL_GLOBAL_ALL);
+    Input input;
     if (argc > 1) {
-        CURL* curl = curl_easy_init();
-        if (curl) {
-            CURLcode res;
-            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
-            res = curl_easy_perform(curl);
-            if (res != 0) {
-                cerr << curl_easy_strerror(res);
-                exit(1);
-            }
-        }
-        curl_easy_cleanup(curl);
-        return(0);
-        
+        input = download(argv[1]);
     }
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    auto in1 = input_data(cin,true);
-    auto bins = make_histogram(in1.numbers, in1.bin_count);
-    show_histogram_svg(bins, in1.stroke);
-    return 0;
+    else {
+        input = input_data(cin, true);
+    }
+
+    const auto bins = make_histogram(input.numbers, input.bin_count);
+    show_histogram_svg(bins,input.stroke);
 }
+