more commenting cleanup