Code clean up.
15 files changed