refactor in feature