Code cleanup.
62 files changed