Refactoring prior to firing component event