diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..15a5798
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/bin
+/obj
+*.depend
+*.layout
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 2d63d38..f966f4e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,41 +1,52 @@
 #include <iostream>
 #include <vector>
 #include <math.h>
+#pragma once
 
 using namespace std;
 
-int main()
-{
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    size_t number_count, bin_count;
-    cerr << "Enter number count: ";
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
+
+Input input_data(){
+    size_t number_count;
     cin >> number_count;
-    cerr << "Enter bin count: ";
-    cin >> bin_count;
-    vector<double> numbers(number_count);
-    vector<size_t> bins(bin_count);
-    cerr << "Enter numbers: ";
-    for (size_t i = 0; i < number_count; i++) {
-        cin >> numbers[i];
-    }
-    double min = numbers[0];
-    double max = numbers[0];
-    for (double x : numbers) {
-        if (x < min) {
-            min = x;
-        }
-        else if (x > max) {
-            max = x;
-        }
+    Input in;
+    in.numbers.resize(number_count);
+    for (size_t i = 0; i < number_count; i++){
+        cin >> in.numbers[i];
     }
-    double bin_size = (max - min) / bin_count;
-    for (size_t i = 0; i < number_count; i++) {
+    cin >> in.bin_count;
+    return in;
+}
+
+void find_minmax(const vector<double>& numbers, double& min, double& max) {
+    min = numbers[0];
+	max = numbers[0];
+	for (double x : numbers){
+    	if (x < min){
+        	min = x;
+    	}
+    	else if (x > max){
+        	max = x;
+    	}
+	}
+    return;
+}
+
+vector<size_t> make_histogram(const vector<double>& numbers, size_t& bin_count) {
+    double minn, maxn;
+    find_minmax(numbers, minn, maxn);
+    double bin_size = (maxn - minn) / bin_count;
+    vector<size_t> bins(bin_count, 0);
+    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)) {
+            auto lo = minn + j * bin_size;
+            auto hi = minn + (j + 1) * bin_size;
+            if ((numbers[i] >= lo) && (numbers[i] <= hi)) {
                 bins[j]++;
                 found = true;
             }
@@ -44,81 +55,86 @@ int main()
             bins[bin_count - 1]++;
         }
     }
+    return bins;
+}
+
+void show_histogram_text(const vector<size_t> bins, size_t bin_count) {
     size_t max_count = bins[0];
-    size_t count = 0;
-    short space_count;
-    for (size_t x : bins) {
-        if (x > max_count) {
-            max_count = x;
+    for (size_t i = 1; i < bin_count; i++) {
+        if (bins[i] > max_count) {
+            max_count = bins[i];
         }
     }
+
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+
+    short space_count;
+
+    cerr << "\nHistogram:" << endl;
+
     if (max_count <= MAX_ASTERISK) {
         for (size_t i = 0; i < bin_count; i++) {
             if (bins[i] < 10) {
                 space_count = 2;
             } else if (bins[i] >= 10 && bins[i] < 100) {
                 space_count = 1;
-            } else {
+            } else if (bins[i] >= 100 && bins[i] < 1000) {
                 space_count = 0;
             }
+
+
+
             for (size_t k = 0; k < space_count; k++) {
                 cout << " ";
             }
+
             cout << bins[i];
+
             cout << "|";
-            if (i == 0){
-                for (size_t j = 0; j < bins[i]; j++) {
-                    if (j != bins[i+1]) {
-                        cout << "*";
-                    } else if (j == bins[i+1]){
-                        cout << "V";
-                        }
-                    }
-                } else if (i == bin_count-1){
-                for (size_t j = 0; j < bins[i]; j++) {
-                    if (j != bins[i-1]) {
-                        cout << "*";
-                    } else if (j == bins[i-1]){
-                        cout << "^";
-                    }
-                }
-            } else {
-                for (size_t j = 0; j < bins[i]; j++) {
-                    if (j != bins[i-1]-1 && j != bins[i+1]-1) {
-                        cout << "*";
-                    } else if (j == bins[i-1]-1 && j == bins[i+1]-1){
-                        cout << "N";
-                    } else if (j == bins[i-1]-1){
-                        cout << "^";
-                    } else if (j == bins[i+1]-1){
-                        cout << "V";
-                    }
-                }
+
+
+            for (size_t j = 0; j < bins[i]; j++) {
+                cout << "*";
             }
+
             cout << "\n";
         }
-    } /*else {
+    } else {
         for (size_t i = 0; i < bin_count; i++) {
             if (bins[i] < 10) {
                 space_count = 2;
             } else if (bins[i] >= 10 && bins[i] < 100) {
                 space_count = 1;
-            } else {
+            } else if (bins[i] >= 100 && bins[i] < 1000) {
                 space_count = 0;
             }
+
+
             for (size_t k = 0; k < space_count; k++) {
                 cout << " ";
             }
+
             cout << bins[i];
+
             cout << "|";
+
             size_t height = static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count));
             for (size_t j = 0; j < height; j++) {
                 cout << "*";
             }
+
             cout << "\n";
         }
-    }*/
-    system("pause");
+    }
+}
+
+int main() {
+
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins, in.bin_count);
 
     return 0;
 }