diff --git a/main.cpp b/main.cpp
index 8a71327..83abf99 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,25 +3,31 @@
 
 using namespace std;
 
-int main()
-{
-    size_t number_count;
-    cerr << "Enter number count: ";
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
+Input
+input_data(){
+    size_t number_count, bin_count;
+	cerr << "Enter number count: ";
     cin >> number_count;
-
-    vector<double> numbers(number_count);
-    cerr << "Enter numbers: ";
-    for(size_t i = 0; i < number_count; i ++)
+    Input in;
+    in.numbers.resize(number_count);
+    for (size_t i = 0; i < number_count; i++)
     {
-        cin >> numbers[i];
+        cerr << "Enter Num[" << i << "]: ";
+        cin >> in.numbers[i];
     }
-
-    size_t bin_count;
+    cerr << "Enter bin count: "; cin >> bin_count;
     cerr << "Enter bin count: ";
-    cin >> bin_count;
+    cin >> in.bin_count;
+    return in;
+}
 
-    double min = numbers[0];
-    double max = numbers[0];
+void find_minmax(const vector<double> &numbers, double &min, double &max){
+    min = numbers[0];
+    max = numbers[0];
     for(double number : numbers)
     {
         if(number < min)
@@ -33,10 +39,15 @@ int main()
             max = number;
         }
     }
-
-    vector<size_t> bins(bin_count, 0);
+    return;
+}
+vector<size_t> make_histogram (vector<double> numbers, size_t bin_count){
+    double min;
+    double max;
+    find_minmax (numbers, min, max);
     double bin_size = (max - min) / bin_count;
-    for(size_t i = 0; i < number_count; i++)
+    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++)
@@ -54,7 +65,9 @@ int main()
             bins[bin_count-1]++;
         }
     }
-
+    return bins;
+}
+void show_histogram_text(vector<size_t> bins, size_t bin_count){
     const size_t SCREEN_WIDTH = 80;
     const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 
@@ -91,5 +104,13 @@ int main()
         }
         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;
 
 }