Use import cleanup
Add missing typehint