Code cleanup
Log4net logging added