Minor cleanup and commenting.