Change variable names and avoid if / else (golint)

Finally ran golint on the package, there were many cases of variable
naming and a few cases of if {… return …} else { … } that could drop
the else.  Now there are no lint messages.