Code cleanup.
13 files changed