Comments and code clean up.
48 files changed