spec refactering.