Refactor feature envy