Clean up and organization.