Removed unused imports, organized imports