Refactoring the specs