tidy up pending comments structure