refactor: minor refactor Framework