Code cleanup.
18 files changed