Code cleanup.
30 files changed