Just comment improvements