Minnor clean up

cleaned code up a bit, to look more fulid