diff --git a/main.cpp b/main.cpp
index 99dfcf9..487ac3c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,39 +4,46 @@
 
 using namespace std;
 
-int main()
-{
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-
-    int number_count, bucket;
-
-    cerr << "Enter number count: "; cin >> number_count;
-    cerr << "Enter bucket: "; cin >> bucket;
-
-    vector <double> numbers(number_count);
-    for (int i = 0; i < number_count; i++) cin >> numbers[i];
-
-    float min = numbers[0];
-    float max = numbers[0];
+struct Input {
+    vector<double> numbers;
+    size_t bucket{};
+    size_t number_count{};
+};
+
+Input
+input_data() {
+    Input in;
+    cin >> in.number_count;
+    cin >> in.bucket;
+    in.numbers.resize(in.number_count);
+    for (size_t i = 0; i < in.number_count; i++) {
+        cin >> in.numbers[i];
+    }
+    return in;
+}
 
-    for (float x : numbers)
+void
+find_minmax(const vector<double>& numbers, double& min, double& max) {
+    min = numbers[0];
+    max = numbers[0];
+    for (double x : numbers)
     {
         if (x < min) min = x;
         else if (x > max) max = x;
     }
+}
 
+vector <size_t>
+make_histogram(const vector<double>& numbers, size_t bucket, size_t number_count) {
+    vector <size_t> stolb(bucket);
+    double min, max;
+    find_minmax (numbers, min, max);
     float k = (max-min)/bucket;
-
-    vector <int> stolb(bucket);
-
-    for (int j = 0; j < bucket; j++) stolb[j] = 0;
-
-    for (int i = 0; i < number_count; i++)
+    for (size_t i = 0; i < bucket; i++) stolb[i] = 0;
+    for (size_t i = 0; i < number_count; i++)
     {
         bool flag = false;
-        for (int j = 0; (j < bucket && !flag); j++)
+        for (size_t j = 0; (j < bucket && !flag); j++)
         {
             if (numbers[i] >= (min+k*j) && numbers[i] < (min+k*(1+j)))
             {
@@ -47,7 +54,13 @@ int main()
         }
         if (!flag) stolb[bucket-1]++;
     }
+    return stolb;
+}
 
+void
+show_histogram_text(vector <size_t> stolb, size_t bucket) {
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
     int maxlen = 0;
 
     for (int j = 0; j < bucket; j++)
@@ -68,7 +81,15 @@ int main()
         }
         for (int i = 0; i < height; i++) cout << "*";
         cout << "\n";
-    }
+    }}
+
+
+int main()
+{
+
+    auto in = input_data();
+    auto stolb = make_histogram(in.numbers, in.bucket, in.number_count);
+    show_histogram_text(stolb, in.bucket);
 
     return 0;
 }