Specs refactoring