refactor(*): improved code stability