Mild commenting, reorganization.