Refactors Specs