Refactoring of specs