Refactor comment-worths hook