minor readability changes

i've read the code a couple of times in last
two weeks and these are some adjustments based
on that experience.