Code cleanup.
37 files changed