Some refactoring of base content of Journal