diff --git a/main.cpp b/main.cpp
index 1dd5179..85477f4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,51 +1,51 @@
 #include <iostream>
 #include <conio.h>
 #include <vector>
-#include <stdlib.h>
 using namespace std;
-
 int main()
 {
-    const size_t MAX_ELEMENT = 76;
-    size_t number_count;
-    cerr << "Enter number count: ";
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    int i, j;
+    double num;
+    size_t number_count, bin_count;
+    cerr << "Enter number count: " << "\n";
     cin >> number_count;
-
     vector<double> numbers(number_count);
-    cerr << "Enter numbers: " << endl;
-    for (size_t i=0; i < number_count; i++)
+    for (i = 0; i < number_count; i++)
     {
-        cin >> numbers[i];
+        cin >> num;
+        numbers[i] = num;
     }
-
-    size_t bin_count;
-    cerr << "Enter bin count: ";
+    cerr << "Enter bin count: " << "\n";
     cin >> bin_count;
-
-    double min = numbers[0];
-    double max = numbers[0];
-    for(size_t i=0; i < number_count; i++){
-        if (numbers[i] < min)
+    vector<size_t> bins(bin_count);
+    for (i = 0; i < bin_count; i++)
+    {
+        bins[i] = 0;
+    }
+    double min_number = numbers[0];
+    double max_number = numbers[0];
+    for (double x : numbers)
+    {
+        if (x < min_number)
         {
-            min = numbers[i];
+            min_number = x;
         }
-        else if (numbers[i] > max)
+        else if (x > max_number)
         {
-            max = numbers[i];
+            max_number = x;
         }
     }
-
-    vector<size_t> bins(bin_count);
-    double bin_size = (max - min) / bin_count;
-
+    double bin_size = (max_number - min_number) / bin_count;
     for (size_t i = 0; i < number_count; i++)
     {
         bool found = false;
         for (size_t j = 0; (j < bin_count - 1) && !found; j++)
         {
-            auto lower_Bound = min + j * bin_size;
-            auto upper_Bound = min + (j + 1) * bin_size;
-            if ((lower_Bound <= numbers[i]) && (numbers[i] < upper_Bound))
+            auto lo = min_number + j * bin_size;
+            auto hi = min_number + (j + 1) * bin_size;
+            if ((lo <= numbers[i]) && (numbers[i] < hi))
             {
                 bins[j]++;
                 found = true;
@@ -56,50 +56,40 @@ int main()
             bins[bin_count - 1]++;
         }
     }
-
-    double max_count = bins[0];
-    for (size_t j=0; j < bin_count; j++){
-        if (bins[j] > max_count) {
-            max_count = bins[j];
+    size_t max_bin_capacity = bins[0];
+    for (size_t x : bins)
+    {
+        if (x > max_bin_capacity)
+        {
+            max_bin_capacity = x;
         }
     }
-    vector<size_t> height(bin_count);
-    for (size_t j=0; j < bin_count; j++){
-        height[j] = MAX_ELEMENT * (bins[j]/max_count);
-    }
-
-    if (max_count > MAX_ELEMENT){
-        for  (size_t j=0; j < bin_count; j++)
-            {
-                if (bins[j] < 100) {
-                    cout << " ";
-                    if (bins[j] < 10){
-                            cout << " ";
-                    }
-                }
-                cout << bins[j] << "|";
-
-                for (size_t i=0; i < height[j]; i++){
-                        cout << "*";
-                        }
-                cout << endl;
-            }
-    }
-    else {
-        for  (size_t j=0; j < bin_count; j++)
-            {
-                if (bins[j] < 100) {
-                    cout << " ";
-                    if (bins[j] < 10){
-                            cout << " ";
-                    }
-                }
-                cout << bins[j] << "|";
-
-                for (size_t i=0; i < bins[j];i++){
-                        cout << "*";
-                        }
-                cout << endl;
-            }
+    size_t height = 0;
+    for (i = 0; i < bin_count; i++)
+    {
+        if (bins[i] < 10)
+        {
+            cout << "  " << bins[i] << "|";
+        }
+        if ((bins[i] < 100) && (bins[i] > 9))
+        {
+            cout << " " << bins[i] << "|";
+        }
+        if (bins[i] >= 100)
+        {
+            cout <<  bins[i] << "|";
+        }
+        if (bins[i] > 76){
+        height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin_capacity);
+        }
+        if (bins[i] < 76) {
+            height = bins[i];
+        }
+        for (j = 0; j < height; j++)
+        {
+            cout << "*";
+        }
+        cout << "\n";
     }
+    return 0;
 }