use more canonical way to manage comments