Refactored journal class.