Simplified some comments and event factory definitions