Specs refactoring.