simplify a couple things