Re-organization, commenting.