contacts spec refactor