organized imports and removed some unnecessary code