comment tidy-up