just refactor