Refactoring, first specs