chore(all): a bit refactor