Bug 146648 - Code Clean up.
16 files changed