refactor: minor refactor Framework
Merge pull request #19 from golyshevd/refactor

refactor: minor refactor Framework