Continued refactoring events