Slightly improve organization.