diff --git a/vector.cpp b/vector.cpp
index 7ab98d4..6dbf2cb 100644
--- a/vector.cpp
+++ b/vector.cpp
@@ -4,20 +4,32 @@
 const size_t SCREEN_WIDTH = 80;
 const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 using namespace std;
-int main()
+struct Input {
+	vector<double> numbers;
+	size_t bin_count{};
+
+};
+
+Input input_data()
 {
 	size_t number_count;
-	cerr << "Enter number count: ";
 	cin >> number_count;
-	vector<double> numbers(number_count);
-
-	for (int i = 0; i < number_count; i++)
+	Input in;
+	in.numbers.resize(number_count);
+	for (size_t i = 0; i < number_count; i++)
 	{
-		cin >> numbers[i];
+		cin >> in.numbers[i];
 
 	}
-	double min = numbers[0];
-	double max = numbers[0];
+
+	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)
@@ -25,10 +37,14 @@ int main()
 		else if (x > max)
 			max = x;
 	}
-	size_t bin_count=3;
+}
+
+vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count) {
+	double min, max;
+	find_minmax(numbers, min, max);
 	vector<size_t> bins(bin_count);
 	double bin_size = (max - min) / bin_count;
-	for (size_t i = 0; i < number_count; i++)
+	for (size_t i = 0; i < numbers.size(); i++)
 	{
 		bool found = false;
 		for (size_t j = 0; (j < bin_count - 1) && !found; j++)
@@ -46,16 +62,17 @@ int main()
 			bins[bin_count - 1]++;
 		}
 	}
+	return bins;
+}
 
+void show_histogram_text(vector<size_t> bins, size_t bin_count) {
 	double mxbins = bins[0];
-
 	for (double x : bins)
 	{
 		if (x > mxbins)
 			mxbins = x;
 	}
 	double k;
-
 	if (mxbins > MAX_ASTERISK)
 		k = MAX_ASTERISK / mxbins;
 	else
@@ -69,13 +86,18 @@ int main()
 			cout << " ";
 		}
 		cout << bins[i] << "|";
-
-
-					for (int j = 0; j < floor(bins[i] * k); j++)
-			{
-				cout << "*";
-			}
+		for (int j = 0; j < floor(bins[i] * k); j++)
+		{
+			cout << "*";
+		}
 
 		cout << endl;
 	}
 }
+
+int main()
+{
+	Input in = input_data();
+	vector <size_t> bins = make_histogram(in.numbers, in.bin_count);
+	show_histogram_text(bins, in.bin_count);
+}