Refactor spec
Refactor spec