diff --git a/.gitignore b/.gitignore
index c6d2f6a..0e9a7dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /bin
 /obj
-
+*.layout
+*.depend
diff --git a/main.cpp b/main.cpp
index 7319326..6405b06 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,30 +3,37 @@
 
 using namespace std;
 
-int main()
+struct Input
 {
-    size_t number_count,bin_count;
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    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);
 
     vector<double> numbers(number_count);
     for (int i = 0; i < number_count; i++)
     {
         cerr << "Number[" << i << "]=";
-        cin >> numbers[i];
+        cin >> in.numbers[i];
     }
-    cerr << "Enter bin count: ";
-    cin >> bin_count;
 
-    vector<size_t> bins(bin_count);
+    cerr << "Enter 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 x : numbers)
     {
         if (x < min)
@@ -39,16 +46,25 @@ int main()
         }
     }
 
+
+}
+
+vector<size_t> make_histogram(const 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, 0);
 
-    for (size_t i = 0; i < number_count; i++)
+    for (double number : 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 <= number) && (number < hi))
             {
                 bins[j]++;
                 found = true;
@@ -59,7 +75,14 @@ int main()
             bins[bin_count - 1]++;
         }
     }
+    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++)
     {
@@ -106,5 +129,19 @@ int main()
         }
         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);
+
     return 0;
 }