Clean up comment adding/removing behavior