Events classes comments translated in English. Minor following refactoring.