diff --git a/main.cpp b/main.cpp
index 098a9eb..eb44f24 100644
--- a/main.cpp
+++ b/main.cpp
@@ -28,12 +28,10 @@ Input input_data()
     return in;
 }
 
-int main()
+void find_minmax(vector<double> numbers, double& min, double& max)
 {
-    Input in = input_data();
-
-    double min = numbers[0];
-    double max = numbers[0];
+    min = numbers[0];
+    max = numbers[0];
     for (double x : numbers) {
         if (x < min) {
             min = x;
@@ -42,20 +40,28 @@ int main()
             max = x;
         }
     }
-    vector<size_t> bins(bin_count);
-    double bin_size = (max-min)/bin_count;
-    for (size_t i = 0; i < number_count; i++) {
+}
+int main()
+{
+    Input in = input_data();
+
+    double min,max;
+    find_minmax(in.numbers, min, max);
+
+    vector<size_t> bins(in.bin_count);
+    double bin_size = (max-min)/in.bin_count;
+    for (size_t i = 0; i < in.numbers.size(); i++) {
         bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
+        for (size_t j = 0; (j < in.bin_count - 1) && !found; j++) {
             auto lo = min + j * bin_size;
             auto hi = min + (j + 1) * bin_size;
-            if ( (numbers[i] >= lo) && (numbers[i] < hi) ) {
+            if ( (in.numbers[i] >= lo) && (in.numbers[i] < hi) ) {
                 bins[j]++;
                 found = true;
             }
         }
         if (!found) {
-            bins[bin_count-1]++;
+            bins[in.bin_count-1]++;
         }
 
     }