Refactors specs