Refactor idea