Code cleanup.
20 files changed