minor refactoring and typing#26

noskill wants to merge 2 commits into

singnet:mainsingnet/metafusion:mainfrom

noskill:refactor1noskill/metafusion:refactor1Copy head branch name to clipboard