Refactor journalization