Refactor features and specs
Refactor features and specs