Refactoring in specs complete