Code cleanup.
112 files changed