streamlined some more types