cleaning up a couple things