organized imports and fixed code formatting