organize types better