fix: refactore step func in #173-I