clean-up comments