Dome some cleaning-up and commenting.