organized imports and removed commented code