Still comment improvements