Minor refactoring for clarity.
More refactoring for code clarity.