minor refactoring on journal