Reformatting
Refactored OUT EventDispatcher.
A little more refactoring
fixed build errors