Cleaned up commented out code
Better output in the event log