cleanup of some more code comments