r9Log refactoring