organized imports and fixed some warnings