Code cleanup.
5 files changed