Minor cleanups and commenting.