Reorganize imports
Change return annotations and "cls" variable