fixing a couple things i missed
improved the readability a bit