clean up some comments, per review feedback