Code cleanup.
19 files changed