refactor admin events