spec refactors