streamlined some more stuff