Refactor diaries