some "refactor"