Code cleanup.
22 files changed