Organized imports and removed mouse events