cleaned up a couple things
more cleanup