simplifying a bunch of crap