Some code cleanup.
8 files changed