some changes while going through the code

just some readability stuff.