Comments tuneup