re-organize comments