Refactoring, mostly of specs