commenting overhaul