cartoon spec refactor