Cleanup and organization.