diff --git a/src/scripts/charts.js b/src/scripts/charts.js
index 426c57a..75a7e13 100644
--- a/src/scripts/charts.js
+++ b/src/scripts/charts.js
@@ -14,20 +14,24 @@ import Heatmap from './charts/Heatmap';
 // 	);
 // }
 
+const chartTypes = {
+	line: LineChart,
+	bar: BarChart,
+	scatter: ScatterChart,
+	percentage: PercentageChart,
+	heatmap: Heatmap
+};
+
+function getChartByType(chartType = 'line', options) {
+	if (!chartTypes[chartType]) {
+		return new LineChart(options);
+	}
+
+	return new chartTypes[chartType](options);
+}
+
 export default class Chart {
 	constructor(args) {
-		if(args.type === 'line') {
-			return new LineChart(arguments[0]);
-		} else if(args.type === 'bar') {
-			return new BarChart(arguments[0]);
-		} else if(args.type === 'scatter') {
-			return new ScatterChart(arguments[0]);
-		} else if(args.type === 'percentage') {
-			return new PercentageChart(arguments[0]);
-		} else if(args.type === 'heatmap') {
-			return new Heatmap(arguments[0]);
-		} else {
-			return new LineChart(arguments[0]);
-		}
+		return getChartByType(args.type, arguments[0]);
 	}
-}
\ No newline at end of file
+}