spec refactoring (follow up)