Refactoring - specs