Some commenting cleanup