organized imports and fixed compile warnings