cleaned a couple things up