-Removed unused imports
-Moved declaration of dataSource to a better location