Refactor a feature