Refactor features