Tidying up comments