PSR style updates
Create generalized interface for 3rd party events