Code cleanup.
11 files changed