Code clean up.
25 files changed