Comment and tidy up