diff --git a/main.cpp b/main.cpp
index e54b511..90eaebe 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,71 +1,29 @@
 #include <iostream>
 #include <vector>
+#include <algorithm>
+#include "histogram.h"
 using namespace std;
-int main(){
-double min,max,lo,hi;
-size_t number_count,bin_count,i,j;
-const size_t SCREEN_WIDTH = 80;
-const size_t MAX_ASTERISK = SCREEN_WIDTH - 4;
-cerr<<"Enter number_count: ";
-cin>>number_count;
-cerr<<"Enter numbers: ";
-vector<double> numbers;
-for(size_t i=0;i<number_count;++i){
-	double num;
-	cin>>num;
-	numbers.push_back(num);
-}
-cerr<<"Enter bin_count: ";
-cin>>bin_count;
-vector<size_t> bins(bin_count);
-min=numbers[0];
-max=numbers[0];
-for(i=0;i<number_count;i++){
-	if (numbers[i]<min){
-		min=numbers[i];
-	}
-	else if (numbers[i]>max){
-		max=numbers[i];
-	}
+
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
+
+Input
+input_data(istream& in){
+size_t number_count;
+in >> number_count;
+Input cin;
+cin.numbers.resize(number_count);
+for (size_t i = 0; i < number_count; i++){
+    in >> cin.numbers[i];}
+in >> cin.bin_count;
+return cin;
 }
-double bin_size=(max-min)/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++){
-		lo = min + j*bin_size;
-		hi = min + (j+1)*bin_size;
-		if ((lo <= numbers[i])&&(numbers[i]<hi)){
-			bins[j]++;
-			found = true;
-		}
-	}
-	if(!found){
-		bins[bin_count - 1]++;
-	}
-}
-size_t max_count = 0;
-for(i=0;i<bin_count;i++){
-	if (bins[i]>MAX_ASTERISK){
-		max_count=bins[i];
-	}
+
+int main(){
+auto in = input_data(cin);
+auto bins = make_histogram(in.numbers, in.bin_count);
+show_histogram(bins, in.bin_count);
+return 0;
 }
-for(i=0;i<bin_count;i++){
-	if(bins[i]<100){
-		cout<<" ";
-	}
-	if(bins[i]<10){
-		cout<<" ";
-	}
-	cout<<bins[i]<<"|";
-	if(max_count==0){
-		for(j=0;j<bins[i];j++){
-			cout<<"*";
-	}}
-	else{
-		size_t height = MAX_ASTERISK*(static_cast<double>(bins[i])/max_count);
-		for(j=0;j<height;j++){
-			cout<<"*";
-		}
-	}
-	cout<<endl;
-}}