Removed unused import and organized imports