Removed some comments and chartType variable