#80 refactoring Handle: refactoring outer import list