Use a bit more verbose variable names in a few places. A few coding style tweaks