journal events refactoring