Complete refactoring of specs