refactor: just a little code movings