Organized imports and general cleanup