cleaned up a couple things