streamlined some more