Small code clean-up, var renaming, etc