Refactoring
Add specs