refactoring/renaming event handlers