Specs, small refactorings