Complete comment_spec refactor