Minor code clean up changes.
Minor changes in log4net configuration.