minor formatting / comment improvements