Comments tidy up