diff --git a/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate b/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate
index 1029883..7d29fed 100644
Binary files a/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate and b/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/main.cpp b/main.cpp
index 4e25f00..ecb814d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,52 +4,53 @@
 
 using namespace std;
 
-int main()
+struct Input
 {
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    size_t number_count, bin_count, max_bin, height, answer = 0;
-    double maxx, minn;
-    cerr << "Enter number count: "; cin >> number_count; //Кол-во чисел
-    vector <double> numbers(number_count);
-    
-    srand((unsigned int)42);
-    cerr << "Use random numbers?(yes - 1/no - 0)\n"; cin >> answer;
-    if (answer == 1)
-    {
-        for (int i = 0; i < number_count; i++)
-        {
-            cerr << "Enter Num[" << i << "]: "; numbers[i] = rand() % 9; //Ввод рандомных чисел
-        }
-    }
-    else
+    vector<double> numbers;
+    size_t bin_count{};
+};
+
+Input input_data()
+{
+    size_t number_count;
+    cerr << "Enter number count: ";
+    cin >> number_count; // Кол-во чисел
+    Input in;
+    in.numbers.resize(number_count);
+    for (size_t i = 0; i < number_count; i++)
     {
-        for (int i = 0; i < number_count; i++)
-        {
-            cerr << "Enter Num[" << i << "]: "; cin >> numbers[i]; //Ввод чисел
-        }
+        cin >> in.numbers[i];
     }
-    cerr << "Enter bin count: "; cin >> bin_count; //Кол-во корзин
+    cerr << "Enter bin count: ";
+    cin >> in.bin_count;
+    return in;
+}
 
-    vector <size_t> bins(bin_count);
-    maxx = numbers[0]; minn = numbers[1];
-    for (size_t i = 0; i < number_count; i++)
+void find_minmax(vector<double> &numbers, double& min, double& max)
+{
+    min = numbers[0]; max = numbers[0];
+    for (double x : numbers)
     {
-        if (maxx < numbers[i])
-            maxx = numbers[i];
-        if (minn > numbers[i])
-            minn = numbers[i];
+        if (max < x)
+            max = x;
+        if (min > x)
+            min = x;
     }
-    
-    double bin_size = (maxx - minn) / bin_count;
-    
-    for (size_t i = 0; i < number_count; i++)
+}
+
+vector<size_t> make_histogram(vector<double> numbers, size_t bin_count)
+{
+    double min, max;
+    find_minmax(numbers, min, max);
+    double bin_size = (max - min) / bin_count;
+    vector<size_t> bins(bin_count);
+    for (size_t i = 0; i < numbers.size(); i++)
     {
         bool found = false;
         for (size_t j = 0; (j < bin_count - 1) && !found; j++)
         {
-            auto lo = minn + j * bin_size;
-            auto hi = minn + (j + 1) * bin_size;
+            auto lo = min + j * bin_size;
+            auto hi = min + (j + 1) * bin_size;
             if ((lo <= numbers[i]) && (numbers[i] < hi))
             {
                 bins[j]++;
@@ -61,14 +62,15 @@ int main()
             bins[bin_count - 1]++;
         }
     }
-    max_bin = bins[0];
-    height = bins[0];
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i] > max_bin)
-            max_bin = bins[i];
-    }
-    
+    return bins;
+}
+
+const size_t SCREEN_WIDTH = 80;
+const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+void show_histogram_text(std::vector<size_t> bins, size_t bin_count)
+{
+    double max_bin = *std::max_element(bins.begin(), bins.end());
     for (size_t i = 0; i < bin_count; i++)
     {
         if (bins[i] < 100)
@@ -76,12 +78,19 @@ int main()
         if (bins[i] < 10)
             cout << " ";
         cout << bins[i] << "|";
-        height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin);
+        size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin);
         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);
+    show_histogram_text(bins, in.bin_count);
     return 0;
 }