diff --git a/main.cpp b/main.cpp
index aaa7716..c14a7a7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,167 +1,137 @@
-/*После ввода количества чисел предлагайте пользователю генерировать их.
-При положительном ответе заполните исходный массив при помощи функции rand(): каждый элемент должен быть суммой 12 ее результатов.
-
-Указание. В начале программы добавьте srand(time(0)), чтобы случайные числа отличались между запусками программы (аналог Randomize() в Pascal).
-Для составления эталонного вывода замените time(0) на 42.*/
-#include <time.h>
 #include <iostream>
 #include <vector>
 #include <cstdlib>
 using namespace std;
-
-int main()
+struct Input
 {
+    vector<double> numbers;
+    size_t bin_count{};
+};
 
-    //# Переменные + начало программы(вводы)
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-    size_t number_count, bin_count, max_count = 0;
-
+Input
+input_data()
+{
+    Input in;
+    size_t number_count;
     cerr << "Enter number count: ";
     cin >> number_count;
 
+    in.numbers.resize(number_count);
     vector<double> numbers(number_count);
 
-    char gen_num;
-
-    cerr << "randoma want? (y/n): ";
-    cin >> gen_num;
-
-    if (gen_num == 'y')
+    for (size_t i = 0; i < number_count; i++)
     {
-        //srand(42);
-        srand(time(0));
-
-        for (int i = 0; i != number_count; i++)
-        {
-            double sum = 0;
-            for (int j = 0; j < 12; j++)
-            {
-                sum += rand();
-            }
-            numbers[i] = sum;
-        }
+        cerr << "Enter numbers: ";
+        cin >> in.numbers[i];
     }
-    else
-    {
-        for (int i = 0; i != number_count; i++)
-        {
-            cerr << "Input number \n";
-            cin >> numbers[i];
-        }
-    }
-
-    cerr << "korzinki? ";
-    cin >> bin_count;
-    vector<double> bins(bin_count);
-
-    double min = numbers[0];
-    double max = numbers[0];
+    size_t bin_count;
+    cerr << "Enter bin count: ";
+    cin >> in.bin_count;
+    return in;
+}
 
-    for (double x : numbers)
+void
+find_minmax(const vector<double>& numbers, double& min, double& max)
+{
+    min = numbers[0];
+    for (size_t i = 1; i < numbers.size(); i++)
     {
-        if (x < min)
+        if (numbers[i] < min)
         {
-            min = x;
+            min = numbers[i];
         }
-        else if (x > max)
+        else if (numbers[i] > max)
         {
-            max = x;
+            max = numbers[i];
         }
     }
+}
+
+vector<size_t> make_histogram(const vector<double>& numbers,size_t bin_count) {
+    vector<size_t> bins(bin_count, 0);
+    double min, max;
+    find_minmax(numbers, min, max);
+
     double bin_size = (max - min) / bin_count;
-    for (size_t i = 0; i < number_count; i++)
-    {
+    if (bin_size == 0) bin_size = 1;
+
+    for (double num : numbers) {
         bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++)
-        {
-            auto lo = min + j * bin_size;
-            auto hi = min + (j + 1) * bin_size;
-            if ((lo <= numbers[i]) && (numbers[i] < hi))
-            {
-                bins[j]++;
+        for (size_t i = 0; i < bin_count - 1; ++i) {
+            double lo = min + i * bin_size;
+            double hi = lo + bin_size;
+            if (lo <= num && num < hi) {
+                bins[i]++;
                 found = true;
+                break;
             }
         }
-        if (!found)
-        {
-            bins[bin_count - 1]++;
-        }
+        if (!found) bins.back()++;
     }
-    //---
-    //# Вывод гисты
-    size_t height = 76 * (static_cast<double>(bin_count) / max_count);
-
-    for (int i = 0; i != bin_count; i++)
+    return bins;
+}
+void show_histogram_text(const vector<size_t>& bins, size_t& bin_count, double bin_size)
+{
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    size_t max_bin_count = bins[0];
+    for(size_t i = 0; i < bin_count; i++)
     {
-        if (bins[i] > max_count)
+        if(bins[i] > max_bin_count)
         {
-            max_count = bins[i];
+            max_bin_count = bins[i];
         }
     }
 
-    if (max_count > 76)
+    for(size_t i = 0; i < bin_count; i++)
     {
-        for (int i = 0; i != bin_count; i++)
+        if(bins[i]<10)
         {
-            if (bins[i] < 100 && bins[i] > 10)
-            {
-                cout << " " << bins[i] << "|";
-            }
-            else if (bins[i] < 10)
-            {
-                cout << "  " << bins[i] << "|";
-            }
-            else
-            {
-                cout << bins[i] << "|";
-            }
-
-            if (bins[i] != max_count)
+            cout<< "  " << bins[i] << "|";
+        }
+        else
+        {
+            if(bins[i]<100)
             {
-                height = 76 * (bins[i] / max_count);
-                for (int j = 0; j != height; j++)
-                {
-                    cout << "*";
-                }
-                cout << "\n";
+                cout<< " " << bins[i] << "|";
             }
             else
             {
-                height = 76 * 1.0;
-                for (int j = 0; j != height; j++)
+                if(bins[i]<1000)
                 {
-                    cout << "*";
+                    cout<< bins[i] << "|";
                 }
-                cout << "\n";
+
             }
         }
-    }
-    //-----
-    else
-    {
-        for (int i = 0; i != bin_count; i++)
-        {
-            if (bins[i] < 100 && bins[i] > 10)
-            {
-                cout << " " << bins[i] << "|";
-            }
-            else if (bins[i] < 10)
-            {
-                cout << "  " << bins[i] << "|";
-            }
-            else
-            {
-                cout << bins[i] << "|";
-            }
 
-            for (int j = 0; j != bins[i]; j++)
-            {
-                cout << "*";
-            }
-            cout << "\n";
+        size_t height;
+        if(max_bin_count <= MAX_ASTERISK)
+        {
+            height = bins[i];
         }
+        else
+        {
+            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin_count);
+        }
+        for(size_t j = 0; j < height;  j ++)
+        {
+            cout<<"*";
+        }
+        cout<<endl;
     }
 }
+
+int main()
+{
+    auto in = input_data();
+   auto bins = make_histogram(in.numbers, in.bin_count);
+
+   double min, max;
+   double bin_size = (max - min) / in.bin_count;
+    show_histogram_text(bins, in.bin_count, bin_size);
+
+    //# Переменные + начало программы(вводы)
+
+}
 //  | 3 3 5 5 5 4 4 4 4 4