more commenting clean up