Refactoring started
Cleanup specs