Code cleanup.
8 files changed