type hint and move variable
clean and fix export controller.
Merge pull request #451 from arnaudbey/export-fi

Export fix