Code style updates, and various variable name refactorings.