Refactor global application events