Internal comment improvements