diff --git a/main.cpp b/main.cpp
index 9b9d1bc..668bd58 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,48 +1,57 @@
 #include <iostream>
 #include <vector>
-#include <math.h>
+
 using namespace std;
-const size_t SCREEN_WIDTH = 80;
-const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-int main()
-{
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
+Input
+input_data() {
     size_t number_count;
-
-    cout << "Enter number count: ";
     cin >> number_count;
-
-    vector<double> numbers(number_count);
-    numbers.resize(number_count);
-    for(size_t i=0;i<number_count;i++)
-    {
-        cin>>numbers[i];
+    Input in;
+    in.numbers.resize(number_count);
+    for (size_t i = 0; i < number_count; i++) {
+        cin >> in.numbers[i];
     }
     size_t bin_count;
-    cin>>bin_count;
-    vector<size_t> bins(bin_count);
-    double Max = numbers[0], Min = numbers[0];
-    for (double x : numbers)
+    cin >> in.bin_count;
+    return in;
+}
+void
+find_minmax(const vector<double>& numbers, double& Min, double& Max) {
+    Min = numbers[0];
+    Max = numbers[0];
+    for(size_t x : numbers)
     {
-        if (x < Min)
+        if(x < Min)
         {
             Min = x;
-        }
-        else if (x > Max)
+        }else
         {
-            Max = x;
+            if(x > Max)
+            {
+                Max = x;
+            }
         }
     }
+}
+vector<size_t>
+make_histogram(vector<double> numbers, size_t bin_count)
+{
+    std::vector<size_t> bins(bin_count);
+    double Min, Max;
+    find_minmax(numbers, Min, Max);
     double bin_size = (Max - Min) / bin_count;
-    //cout<<" "<<Max<<" "<<Min<<" "<<bin_size<<endl;
-
-    for (size_t i = 0; i < number_count; i++)
+    for (double x : 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))
+                if ((lo <= x) && (x < hi))
                 {
                     bins[j]++;
                     found = true;
@@ -53,27 +62,11 @@ int main()
                 bins[bin_count - 1]++;
             }
         }
-    size_t Max_count = bins[0];
-    for(size_t x : bins)
-    {
-        if(x > Max_count)
-        {
-            Max_count = x;
-        }
-    }
-    for(size_t i =0;i< bin_count;i++)
-    {
-        size_t height = bins[i];
-        printf("%3d:",bins[i]);
-        if(Max_count>(MAX_ASTERISK))
-        {
-            height = (MAX_ASTERISK) * (static_cast<double>(bins[i]) / Max_count);
-        }
-        for(size_t j=0;j<height; j++)
-        {
-            cout<<"*";
-        }
-        cout<<endl;
-    }
+        return bins;
+}
+int main()
+{
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
     return 0;
 }