Some commenting changes