Code cleanup.
9 files changed