Better import handling
Better iter variable