Minor code cleanup.
11 files changed