Cleanup, performance improvement, and organization.