rearranging and updating comments