tidy up the commenting