refactoring
fix spec