Returned back the refactoring: senseless
Returned back the refactoring: senseless
Fix specs