diff --git a/histogram.cpp b/histogram.cpp
new file mode 100644
index 0000000..728e7a3
--- /dev/null
+++ b/histogram.cpp
@@ -0,0 +1,52 @@
+#include <iostream>
+#include <vector>
+#include "histogram.h"
+using namespace std;
+
+void static find_minmax(const vector<double> &numbers, double &min, double &max)
+{
+    min = numbers[0];
+    max = numbers[0];
+    for(double number : numbers)
+    {
+        if(number < min)
+        {
+            min = number;
+        }
+        if(number > max)
+        {
+            max = number;
+        }
+    }
+    return;
+
+}
+
+std::vector<size_t> make_histogram(std::vector<double>& numbers, size_t bin_count)
+{
+
+    double min;
+    double 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 = min + j * bin_size;
+            auto hi = min + (j + 1) * bin_size;
+            if((lo <= numbers[i]) && (numbers[i] < hi))
+            {
+                bins[j]++;
+                found = true;
+            }
+        }
+        if (!found)
+        {
+            bins[bin_count-1]++;
+        }
+    }
+    return bins;
+}
diff --git a/histogram.h b/histogram.h
new file mode 100644
index 0000000..c68033a
--- /dev/null
+++ b/histogram.h
@@ -0,0 +1,7 @@
+#ifndef HISTOGRAM_H_INCLUDED
+#define HISTOGRAM_H_INCLUDED
+#include <vector>
+
+std::vector<size_t> make_histogram(std::vector<double>& numbers, size_t bin_count);
+
+#endif // HISTOGRAM_H_INCLUDED
diff --git a/main.cpp b/main.cpp
index 54a2304..f42e42a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,75 +1,75 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
 
 using namespace std;
 
-int main()
-{
-    setlocale(LC_ALL, "Russian");
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
 
+Input
+input_data() {
     size_t number_count, bin_count;
-    size_t max_count = 0;
-
-    cerr << "Введите количество оценок: ";
+	cerr << "Enter number count: ";
     cin >> number_count;
-
-    vector<double> numbers(number_count);
-
-    for(size_t i = 0; i < number_count; i++){
-        cerr << "Введите число " << i + 1 << " : ";
-        cin >> numbers[i];
+    Input in;
+    in.numbers.resize(number_count);
+    for (size_t i = 0; i < number_count; i++)
+    {
+        cerr << "Enter Num[" << i << "]: ";
+        cin >> in.numbers[i];
     }
+    cerr << "Enter bin count: "; cin >> bin_count;
+    cerr << "Enter bin count: ";
+    cin >> in.bin_count;
+    return in;
+}
 
-    cerr << "Введите количество корзин: ";
-    cin >> bin_count;
-
-    vector<size_t> bins(bin_count, 0);
+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;
 
-    double min = numbers[0];
-    double max = numbers[0];
-    for (size_t i = 1; i < number_count; i++) {
-        if (numbers[i] < min) {
-            min = numbers[i];
-        }
-        if (numbers[i] > max) {
-            max = numbers[i];
+    size_t max_bin = bins[0];
+    for(size_t i = 0; i < bin_count; i++)
+    {
+        if(bins[i] > max_bin)
+        {
+            max_bin = bins[i];
         }
     }
 
-    double bin_size = (max - min) / bin_count;
+    for (size_t bin: bins)
+    {
+        size_t height = bin;
 
-    for (size_t i = 0; i < number_count; i++) {
-        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]++;
-                found = true;
-            }
+        if (max_bin > MAX_ASTERISK)
+        {
+          height = MAX_ASTERISK * (static_cast<double>(bin) / max_bin);
         }
-        if (!found) {
-            bins[bin_count - 1]++;
-        }
-    }
 
-    //максимум элементов в корзине
-    for (size_t i = 0; i < bin_count; i++) {
-        if (bins[i] > max_count) {
-            max_count = bins[i];
+        if (bin < 100)
+        {
+            cout << ' ';
         }
-    }
-
-    for (size_t i = 1; i <= max_count; i++) { //по тсрокам
-        for (size_t j = 0; j < bin_count; j++) { //по корзинам
-            if (bins[j] >= i) {
-                cout << "*";
-            } else {
-                cout << " ";
-            }
+        if (bin < 10)
+        {
+            cout << ' ';
+        }
+        cout << bin << "|";
+        for(size_t i = 0; i < height; i++)
+        {
+            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;
 }