Minor code cleanup.
6 files changed