Code cleanup.
21 files changed