More cleanup and organization.