A bit of spec refactoring