Minor renaming and commenting.