Removed files that should have been ignored
Changed log event messages
Refactored slightly