Refactor
Improve specs