journal refactoring