journal parser refactoring