Refactoring spec
Refactoring spec