streamlined a bunch of stuff